Bug 1530908 - Use an environment variable to enable LTO on automation…

…. r=chmanchester This allows to disable it more easily for artifact builds. Differential Revision: https://phabricator.services.mozilla.com/D21311 --HG-- extra : moz-landing-system : lando
mozilla · Mar 6, 2019 · d876d02 · d876d02
1 parent e65a86f
commit d876d02
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 24 deletions.
diff --git a/browser/config/mozconfigs/macosx64/beta b/browser/config/mozconfigs/macosx64/beta
@@ -3,6 +3,6 @@
 ac_add_options --enable-official-branding
 ac_add_options --enable-verify-mar
 
-ac_add_options --enable-lto
+export MOZ_LTO=1
 
 . "$topsrcdir/build/mozconfig.common.override"
diff --git a/browser/config/mozconfigs/macosx64/devedition b/browser/config/mozconfigs/macosx64/devedition
@@ -6,7 +6,7 @@ MOZ_REQUIRE_SIGNING=0
 ac_add_options --disable-install-strip
 ac_add_options --enable-verify-mar
 
-ac_add_options --enable-lto
+export MOZ_LTO=1
 
 ac_add_options --enable-instruments
 

diff --git a/browser/config/mozconfigs/macosx64/nightly b/browser/config/mozconfigs/macosx64/nightly
@@ -9,7 +9,7 @@ if test `uname -s` != Linux; then
   ac_add_options --enable-dtrace
 fi
 
-ac_add_options --enable-lto
+export MOZ_LTO=1
 
 ac_add_options --with-branding=browser/branding/nightly
 

diff --git a/browser/config/mozconfigs/macosx64/release b/browser/config/mozconfigs/macosx64/release
@@ -6,7 +6,7 @@
 ac_add_options --enable-official-branding
 ac_add_options --enable-verify-mar
 
-ac_add_options --enable-lto
+export MOZ_LTO=1
 
 # safeguard against someone forgetting to re-set EARLY_BETA_OR_EARLIER in
 # defines.sh during the beta cycle

diff --git a/browser/config/mozconfigs/win64-aarch64/beta b/browser/config/mozconfigs/win64-aarch64/beta
@@ -5,7 +5,7 @@
 ac_add_options --enable-official-branding
 ac_add_options --enable-verify-mar
 
-ac_add_options --enable-lto
+export MOZ_LTO=1
 
 unset ENABLE_CLANG_PLUGIN
 

diff --git a/browser/config/mozconfigs/win64-aarch64/devedition b/browser/config/mozconfigs/win64-aarch64/devedition
@@ -7,7 +7,7 @@ MOZ_REQUIRE_SIGNING=0
 
 ac_add_options --enable-verify-mar
 
-ac_add_options --enable-lto
+export MOZ_LTO=1
 
 ac_add_options --with-branding=browser/branding/aurora
 

diff --git a/browser/config/mozconfigs/win64-aarch64/nightly b/browser/config/mozconfigs/win64-aarch64/nightly
@@ -4,7 +4,7 @@
 
 ac_add_options --enable-verify-mar
 
-ac_add_options --enable-lto
+export MOZ_LTO=1
 
 ac_add_options --with-branding=browser/branding/nightly
 

diff --git a/browser/config/mozconfigs/win64-aarch64/release b/browser/config/mozconfigs/win64-aarch64/release
@@ -8,7 +8,7 @@
 ac_add_options --enable-official-branding
 ac_add_options --enable-verify-mar
 
-ac_add_options --enable-lto
+export MOZ_LTO=1
 
 unset ENABLE_CLANG_PLUGIN
 

diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
@@ -1545,6 +1545,7 @@ set_config('PGO_JARLOG_PATH', depends_if('--with-pgo-jarlog')(lambda p: p))
 # ==============================================================
 
 js_option('--enable-lto',
+          env='MOZ_LTO',
           nargs='?',
           choices=('full', 'thin'),
           help='Enable LTO')

diff --git a/build/mozconfig.no-compile b/build/mozconfig.no-compile
@@ -28,6 +28,7 @@ unset MACOS_PRIVATE_FRAMEWORKS_DIR
 unset DIA_SDK_PATH
 unset VC_PATH
 unset WINDOWSSDKDIR
+unset MOZ_LTO
 
 unset MOZ_STDCXX_COMPAT
 unset MOZ_NO_PIE_COMPAT

diff --git a/mobile/android/config/mozconfigs/android-aarch64/nightly b/mobile/android/config/mozconfigs/android-aarch64/nightly
@@ -10,10 +10,7 @@ export AR="$topsrcdir/clang/bin/llvm-ar"
 export NM="$topsrcdir/clang/bin/llvm-nm"
 export RANLIB="$topsrcdir/clang/bin/llvm-ranlib"
 
-# Enable LTO if the NDK is available.
-if [ -z "$NO_NDK" ]; then
-  ac_add_options --enable-lto
-fi
+export MOZ_LTO=1
 
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1

diff --git a/mobile/android/config/mozconfigs/android-api-16/nightly b/mobile/android/config/mozconfigs/android-api-16/nightly
@@ -20,9 +20,6 @@ export AR="$topsrcdir/clang/bin/llvm-ar"
 export NM="$topsrcdir/clang/bin/llvm-nm"
 export RANLIB="$topsrcdir/clang/bin/llvm-ranlib"
 
-# Enable LTO if the NDK is available.
-if [ -z "$NO_NDK" ]; then
-  ac_add_options --enable-lto
-fi
+export MOZ_LTO=1
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-x86/nightly b/mobile/android/config/mozconfigs/android-x86/nightly
@@ -18,9 +18,6 @@ export AR="$topsrcdir/clang/bin/llvm-ar"
 export NM="$topsrcdir/clang/bin/llvm-nm"
 export RANLIB="$topsrcdir/clang/bin/llvm-ranlib"
 
-# Enable LTO if the NDK is available.
-if [ -z "$NO_NDK" ]; then
-  ac_add_options --enable-lto
-fi
+export MOZ_LTO=1
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
diff --git a/mobile/android/config/mozconfigs/android-x86_64/nightly b/mobile/android/config/mozconfigs/android-x86_64/nightly
@@ -10,10 +10,7 @@ export AR="$topsrcdir/clang/bin/llvm-ar"
 export NM="$topsrcdir/clang/bin/llvm-nm"
 export RANLIB="$topsrcdir/clang/bin/llvm-ranlib"
 
-# Enable LTO if the NDK is available.
-if [ -z "$NO_NDK" ]; then
-  ac_add_options --enable-lto
-fi
+export MOZ_LTO=1
 
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1