Bug 776537 - Pass a valid environment to populate_virtualenv.py, unbreaking configure, by expanding HOST_CFLAGS and friends when they're created. r=glandium
☠☠ backed out by 28c7063c8cda ☠ ☠
authorJustin Lebar <justin.lebar@gmail.com>
Mon, 23 Jul 2012 12:57:55 -0400
changeset 100164 603215dd3a5e1be32780b9a7bfbffb788987169c
parent 100163 fd7d6cfafe09a4b966082df3a01e7d7e7c7c7f5f
child 100165 28c7063c8cda24c5fd8fa79ff9e2757350fc3b8b
push id12358
push userjlebar@mozilla.com
push dateMon, 23 Jul 2012 16:59:13 +0000
treeherdermozilla-inbound@603215dd3a5e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs776537
milestone17.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 776537 - Pass a valid environment to populate_virtualenv.py, unbreaking configure, by expanding HOST_CFLAGS and friends when they're created. r=glandium
configure.in
--- a/configure.in
+++ b/configure.in
@@ -333,38 +333,38 @@ else
     AC_PROG_CXX
     AC_PROG_RANLIB
     MOZ_PATH_PROGS(AS, $AS as, $CC)
     AC_CHECK_PROGS(AR, ar, :)
     AC_CHECK_PROGS(LD, ld, :)
     AC_CHECK_PROGS(STRIP, strip, :)
     AC_CHECK_PROGS(WINDRES, windres, :)
     if test -z "$HOST_CC"; then
-        HOST_CC='$(CC)'
+        HOST_CC="$CC"
     fi
     if test -z "$HOST_CFLAGS"; then
-        HOST_CFLAGS='$(CFLAGS)'
+        HOST_CFLAGS="$CFLAGS"
     fi
     if test -z "$HOST_CXX"; then
-        HOST_CXX='$(CXX)'
+        HOST_CXX="$CXX"
     fi
     if test -z "$HOST_CXXFLAGS"; then
-        HOST_CXXFLAGS='$(CXXFLAGS)'
+        HOST_CXXFLAGS="$CXXFLAGS"
     fi
     if test -z "$HOST_LDFLAGS"; then
-        HOST_LDFLAGS='$(LDFLAGS)'
+        HOST_LDFLAGS="$LDFLAGS"
     fi
     if test -z "$HOST_RANLIB"; then
-        HOST_RANLIB='$(RANLIB)'
+        HOST_RANLIB="$RANLIB"
     fi
     if test -z "$HOST_AR"; then
-        HOST_AR='$(AR)'
+        HOST_AR="$AR"
     fi
     if test -z "$HOST_AR_FLAGS"; then
-        HOST_AR_FLAGS='$(AR_FLAGS)'
+        HOST_AR_FLAGS="$AR_FLAGS"
     fi
 fi
 
 MOZ_TOOL_VARIABLES
 
 dnl ========================================================
 dnl Special win32 checks
 dnl ========================================================
@@ -8785,17 +8785,17 @@ mingw*)
     ;;
 esac
 
 AC_SUBST(PYTHON)
 
 # Populate the virtualenv
 AC_MSG_RESULT([Populating Python virtualenv])
 MACOSX_DEPLOYMENT_TARGET= LDFLAGS="${HOST_LDFLAGS}" \
-  CC="${CC}" CXX="${CXX}" \
+  CC="${HOST_CC}" CXX="${HOST_CXX}" \
   CFLAGS="${HOST_CFLAGS}" CXXFLAGS="${HOST_CXXFLAGS}" \
   $PYTHON $_topsrcdir/build/virtualenv/populate_virtualenv.py \
     $_topsrcdir $_topsrcdir/build/virtualenv/packages.txt \
   || exit 1
 
 dnl Load the list of Makefiles to generate.
 dnl   To add new Makefiles, edit allmakefiles.sh.
 dnl   allmakefiles.sh sets the variable, MAKEFILES.