Bug 1417689 - Remove explicit --enable-elf-hack in mozconfigs. r=nalexander
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 16 Nov 2017 08:31:45 +0900
changeset 392149 fa0234108fd09e30dfeef56a8bbbefdf69f593c1
parent 392148 5c10b51306b1e4dc51ecab923502a9539b6cd1ea
child 392150 5b1914b0d83e37f6c513a50451fb7d227be52b6c
push id32911
push userrgurzau@mozilla.com
push dateThu, 16 Nov 2017 10:05:12 +0000
treeherdermozilla-central@92235deefc25 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1417689
milestone59.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1417689 - Remove explicit --enable-elf-hack in mozconfigs. r=nalexander --enable-elf-hack is the default on all platforms where it's supported, and is completely ignored on platforms where it's not supported. While moving the flag to moz.configure, we're going to make it only work on platforms where elfhack is supported, so we at least need to remove it from mozconfigs for those platforms where it's not supported. But generally speaking, we want less things in mozconfigs, so just remove it from there, since it's the default anyways.
browser/config/mozconfigs/linux64/hazards
build/unix/mozconfig.linux
mobile/android/config/mozconfigs/common
--- a/browser/config/mozconfigs/linux64/hazards
+++ b/browser/config/mozconfigs/linux64/hazards
@@ -11,17 +11,16 @@ MOZ_HAZARD=1
 
 MOZ_AUTOMATION_BUILD_SYMBOLS=0
 MOZ_AUTOMATION_L10N_CHECK=0
 MOZ_AUTOMATION_PACKAGE=0
 MOZ_AUTOMATION_PACKAGE_TESTS=0
 MOZ_AUTOMATION_UPLOAD=0
 
 . "$topsrcdir/build/mozconfig.common"
-ac_add_options --enable-elf-hack
 
 . "$topsrcdir/build/unix/mozconfig.stdcxx"
 
 . "$topsrcdir/build/mozconfig.stylo"
 
 # The objdir must be at a known location so its path can be stripped from the
 # filenames stored by the analysis
 mk_add_options MOZ_OBJDIR=obj-analyzed
--- a/build/unix/mozconfig.linux
+++ b/build/unix/mozconfig.linux
@@ -20,18 +20,16 @@ then
   # We want to make sure we use binutils and other binaries in the tooltool
   # package.
   mk_add_options PATH="$TOOLTOOL_DIR/gcc/bin:$PATH"
 else
   CC="/tools/gcc-4.7.3-0moz1/bin/gcc"
   CXX="/tools/gcc-4.7.3-0moz1/bin/g++"
 fi
 
-ac_add_options --enable-elf-hack
-
 . "$topsrcdir/build/unix/mozconfig.stdcxx"
 
 # PKG_CONFIG_LIBDIR is appropriately overridden in mozconfig.linux32
 export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig
 
 export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/builds/crash-stats-api.token
 
 . "$topsrcdir/build/unix/mozconfig.gtk"
--- a/mobile/android/config/mozconfigs/common
+++ b/mobile/android/config/mozconfigs/common
@@ -35,18 +35,16 @@ elif [ ! -f /etc/redhat-release ] || [ "
 
     mk_add_options "export JAVA_HOME=$topsrcdir/java_home"
     mk_add_options "export PATH=$PATH:$topsrcdir/java_home/bin"
 
     HOST_CC="$topsrcdir/gcc/bin/gcc"
     HOST_CXX="$topsrcdir/gcc/bin/g++"
 fi
 
-ac_add_options --enable-elf-hack
-
 ANDROID_NDK_VERSION="r10e"
 ANDROID_NDK_VERSION_32BIT="r8c"
 
 # Build Fennec
 ac_add_options --enable-application=mobile/android
 ac_add_options --with-android-sdk="$topsrcdir/android-sdk-linux"
 
 ac_add_options --with-gradle="$topsrcdir/android-gradle-dependencies/gradle-dist/bin/gradle"