Bug 1077212 - Move MOZ_FOLD_LIBS to configure. r=mshal
authorMike Hommey <mh+mozilla@glandium.org>
Sat, 04 Oct 2014 10:33:46 +0900
changeset 232017 4da1ac5c08a17e1e897c18c9f379296d20481708
parent 232016 d959a6081ceacde13d41b8a4ee192c912c85ef02
child 232018 5eead8ca23a3559fa627c61969d164b042484b6c
push id4187
push userbhearsum@mozilla.com
push dateFri, 28 Nov 2014 15:29:12 +0000
treeherdermozilla-beta@f23cc6a30c11 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1077212
milestone35.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 1077212 - Move MOZ_FOLD_LIBS to configure. r=mshal Setting MOZ_FOLD_LIBS should stop being an opt-in for individual applications, which also makes them responsible for doing the right thing, which happens not to be the case for B2G Desktop Linux builds. Enforcing MOZ_FOLD_LIBS to be set on the relevant platforms in configure ensures everything is setup up correctly, and also allows to stop caring about supporting now hypothetical e.g. MSVC builds without MOZ_FOLD_LIBS (which require to pass DLLFLAGS down to the nspr build system to make nspr built against mozglue which would now be unnecessary)
b2g/confvars.sh
browser/confvars.sh
configure.in
mobile/android/confvars.sh
xulrunner/confvars.sh
--- a/b2g/confvars.sh
+++ b/b2g/confvars.sh
@@ -55,16 +55,15 @@ MOZ_PAY=1
 MOZ_TOOLKIT_SEARCH=
 MOZ_PLACES=
 MOZ_B2G=1
 
 if test "$OS_TARGET" = "Android"; then
 MOZ_NUWA_PROCESS=1
 MOZ_B2G_LOADER=1
 fi
-MOZ_FOLD_LIBS=1
 
 MOZ_JSDOWNLOADS=1
 
 MOZ_BUNDLED_FONTS=1
 
 JSGC_GENERATIONAL=1
 JS_GC_SMALL_CHUNK_SIZE=1
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -50,19 +50,16 @@ MOZ_APP_ID={ec8030f7-c20a-464f-9b0e-13a3
 # of values.
 ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-central
 # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
 MAR_CHANNEL_ID=firefox-mozilla-central
 MOZ_PROFILE_MIGRATOR=1
 MOZ_APP_STATIC_INI=1
 MOZ_WEBAPP_RUNTIME=1
 MOZ_MEDIA_NAVIGATOR=1
-if test "$OS_TARGET" = "WINNT" -o "$OS_TARGET" = "Darwin"; then
-  MOZ_FOLD_LIBS=1
-fi
 MOZ_WEBGL_CONFORMANT=1
 # Enable navigator.mozPay
 MOZ_PAY=1
 # Enable activities. These are used for FxOS developers currently.
 MOZ_ACTIVITIES=1
 MOZ_JSDOWNLOADS=1
 MOZ_WEBM_ENCODER=1
 # Enable generational GC on desktop.
--- a/configure.in
+++ b/configure.in
@@ -4095,16 +4095,25 @@ AC_SUBST(MOZ_BUILD_APP)
 AC_SUBST(MOZ_PHOENIX)
 AC_SUBST(MOZ_XULRUNNER)
 AC_SUBST(MOZ_B2G)
 AC_SUBST(MOZ_MULET)
 AC_SUBST(MOZ_B2G_VERSION)
 
 AC_DEFINE_UNQUOTED(MOZ_BUILD_APP,$MOZ_BUILD_APP)
 
+case "$OS_TARGET" in
+WINNT|Darwin|Android)
+  MOZ_FOLD_LIBS=1
+  ;;
+*)
+  MOZ_FOLD_LIBS=
+  ;;
+esac
+
 dnl ========================================================
 dnl Check Android SDK version depending on mobile target.
 dnl ========================================================
 
 if test -z "$gonkdir" ; then
     # Minimum Android SDK API Level we require.
     case "$MOZ_BUILD_APP" in
     mobile/android)
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -44,18 +44,16 @@ MOZ_USE_NATIVE_POPUP_WINDOWS=1
 
 MOZ_APP_ID={aa3c5121-dab2-40e2-81ca-7ea25febc110}
 
 MOZ_APP_STATIC_INI=1
 
 # Enable on-demand decompression
 MOZ_ENABLE_SZIP=1
 
-MOZ_FOLD_LIBS=1
-
 # Enable navigator.mozPay
 MOZ_PAY=1
 
 # Enable UI for healthreporter
 MOZ_SERVICES_HEALTHREPORT=1
 
 # Wifi-AP/cell tower data reporting is enabled on non-release builds.
 if test ! "$RELEASE_BUILD"; then
--- a/xulrunner/confvars.sh
+++ b/xulrunner/confvars.sh
@@ -12,12 +12,9 @@ MOZ_APP_VERSION=$MOZILLA_VERSION
 MOZ_PLACES=1
 MOZ_EXTENSIONS_DEFAULT=" gio"
 MOZ_URL_CLASSIFIER=1
 MOZ_SERVICES_COMMON=1
 MOZ_SERVICES_CRYPTO=1
 MOZ_SERVICES_METRICS=1
 MOZ_SERVICES_SYNC=1
 MOZ_MEDIA_NAVIGATOR=1
-if test "$OS_TARGET" = "WINNT" -o "$OS_TARGET" = "Darwin"; then
-  MOZ_FOLD_LIBS=1
-fi
 MOZ_SERVICES_HEALTHREPORT=1