Bug 1290045 - Pass JS_STANDALONE as a configure argument, instead of an environment variable. r=chmanchester
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 29 Jul 2016 22:14:33 +0900
changeset 349536 70e0031ebf1c1a07ff07c1b528336886731a5f7e
parent 349535 c80456e5e3dd72a65de2f7acaf5be73f3df80144
child 349537 b9adb0648dba49e02092a473de7b89167662e4c8
push id1230
push userjlund@mozilla.com
push dateMon, 31 Oct 2016 18:13:35 +0000
treeherdermozilla-release@5e06e3766db2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerschmanchester
bugs1290045
milestone50.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 1290045 - Pass JS_STANDALONE as a configure argument, instead of an environment variable. r=chmanchester Python configure "environment variables" can be passed as actual environment variables, but can also be passed as command line arguments (unless they also make it to old-configure, which doesn't support that). Passing empty environment variables is broken in msys2/cygwin: the subprocess doesn't see the environment variable being set, so it can't tell the difference between "not set" and "set to nothing", which has a different meaning for python configure environment variables. Currently, JS_STANDALONE is passed this way. Passing it as a command line argument makes it properly passed down to the subconfigure.
old-configure.in
--- a/old-configure.in
+++ b/old-configure.in
@@ -6756,17 +6756,16 @@ export MOZ_SYSTEM_ZLIB
 export MOZ_ZLIB_CFLAGS
 export MOZ_ZLIB_LIBS
 export MOZ_APP_NAME
 export MOZ_APP_REMOTINGNAME
 export RUSTC
 export MOZILLA_CENTRAL_PATH=$_topsrcdir
 export STLPORT_CPPFLAGS
 export STLPORT_LIBS
-export JS_STANDALONE=
 unset MOZ_BUILD_APP
 export DIST
 export MOZ_LINKER
 export ZLIB_IN_MOZGLUE
 export AR
 export RANLIB
 export CPP
 export CC
@@ -6784,16 +6783,17 @@ export HOST_CFLAGS
 export HOST_CPPFLAGS
 export HOST_CXXFLAGS
 export HOST_LDFLAGS
 
 if ! test -e js; then
     mkdir js
 fi
 
+ac_configure_args="$ac_configure_args JS_STANDALONE="
 AC_OUTPUT_SUBDIRS(js/src,$cache_file)
 ac_configure_args="$_SUBDIR_CONFIG_ARGS"
 
 fi # COMPILE_ENVIRONMENT
 
 dnl we need to run config.status after js/src subconfigure because we're
 dnl traversing its moz.build and we need its config.status for that.
 dnl However, writing our own config.status needs to happen before