Bug 1632343 - Follow-up: Fix l10n repacks on Daily build. r=mkmelin rs=bustage-fix DONTBUILD
authorRob Lemley <rob@thunderbird.net>
Thu, 23 Apr 2020 09:23:06 -0400
changeset 38029 53c02cf46815108a2fdcb6e8872ff09c5a63054c
parent 38028 d010d86cedeb754677886254f697dd775a0127ea
child 38030 e5f1a16870bf433173f464239e9068f7075ed9c1
push id2595
push userclokep@gmail.com
push dateMon, 04 May 2020 19:02:04 +0000
treeherdercomm-beta@f53913797371 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmkmelin, bustage-fix
bugs1632343
Bug 1632343 - Follow-up: Fix l10n repacks on Daily build. r=mkmelin rs=bustage-fix DONTBUILD COMPILE_ENVIRONMENT will not be set for L10n repacks.
third_party/botan/Makefile.in
third_party/botan/moz.build
third_party/rnpdefs.mozbuild
--- a/third_party/botan/Makefile.in
+++ b/third_party/botan/Makefile.in
@@ -1,10 +1,10 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 include $(moztopsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 
-ifndef MOZ_ARTIFACT_BUILDS
+ifdef COMPILE_ENVIRONMENT
 export:: build/build.h
 endif
--- a/third_party/botan/moz.build
+++ b/third_party/botan/moz.build
@@ -38,17 +38,17 @@ else:
 # Run Botan's configure.py to generate build.h. Use --with-cmake to avoid
 # writing a Makefile that would overwrite our own.
 botan_generated = [
     'build/build.h',
     'build/build_config.json',
     'CMakeLists.txt',
     ]
 
-if not CONFIG['MOZ_ARTIFACT_BUILDS']:
+if CONFIG['COMPILE_ENVIRONMENT']:
     GENERATED_FILES += botan_generated
     botan_build = GENERATED_FILES['build/build.h']
     botan_build.script = 'botan_configure.py'
     botan_build.flags = [
         '--cc-bin={}'.format(CONFIG['MZLA_RNP_CXX']),
         '--cpu={}'.format(CONFIG['target_cpu']),
         '--os={}'.format(botan_os),
         '--with-build-dir={}'.format(OBJDIR),
--- a/third_party/rnpdefs.mozbuild
+++ b/third_party/rnpdefs.mozbuild
@@ -14,17 +14,17 @@ rnp_dist_info = '{} {} rnp'.format(
     CONFIG['MOZ_APP_DISPLAYNAME'],
     CONFIG['MOZ_APP_VERSION_DISPLAY']
 )
 
 COMPILE_FLAGS['OS_CFLAGS'] = []
 COMPILE_FLAGS['OS_CXXFLAGS'] = []
 COMPILE_FLAGS['OS_INCLUDES'] = []
 COMPILE_FLAGS['CLANG_PLUGIN'] = []
-if not CONFIG['MOZ_ARTIFACT_BUILDS']:
+if CONFIG['COMPILE_ENVIRONMENT']:
     COMPILE_FLAGS['MOZ_HARDENING_CFLAGS'] = []
 
 if CONFIG['CC_TYPE'] == 'clang-cl':
     CFLAGS += [
         '-Wno-inconsistent-dllimport',
         '-Wno-macro-redefined', # 'WIN32_LEAN_AND_MEAN' macro redefined
     ]
     USE_STATIC_LIBS = True