Bug 758381 - Unbreak build on MacOS 10.7. r=ted
authorHub Figuière <hfiguiere@mozilla.com>
Thu, 24 May 2012 17:24:07 -0700
changeset 96397 c9239be4261f20aee79cafdcd303ccdf3c4cac74
parent 96396 2ee09416b1d7ae5fc4419fa11ee617be953f8072
child 96398 43ee60cc0ee1192f0a3eba45c060a330860ec9bb
push idunknown
push userunknown
push dateunknown
reviewersted
bugs758381
milestone15.0a1
Bug 758381 - Unbreak build on MacOS 10.7. r=ted
configure.in
--- a/configure.in
+++ b/configure.in
@@ -8962,17 +8962,17 @@ MOZ_DEFINES=$DEFS
 AC_SUBST(MOZ_DEFINES)
 rm -f confdefs.h
 mv confdefs.h.save confdefs.h
 
 dnl Create a virtualenv where we can install local Python packages
 AC_MSG_RESULT([Creating Python virtualenv])
 rm -rf _virtualenv
 mkdir -p _virtualenv
-PYTHONDONTWRITEBYTECODE= $PYTHON $_topsrcdir/other-licenses/virtualenv/virtualenv.py ./_virtualenv
+MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= $PYTHON $_topsrcdir/other-licenses/virtualenv/virtualenv.py ./_virtualenv
 case "$host_os" in
 mingw*)
     PYTHON=`pwd`/_virtualenv/Scripts/python.exe
     ;;
 *)
     PYTHON=`pwd`/_virtualenv/bin/python
     ;;
 esac
@@ -8999,17 +8999,17 @@ rm conftest.sh
 echo $MAKEFILES > unallmakefiles
 
 mv -f config/autoconf.mk config/autoconf.mk.orig 2> /dev/null
 
 AC_OUTPUT($MAKEFILES)
 
 # Populate the virtualenv
 AC_MSG_RESULT([Populating Python virtualenv])
-$MAKE -C build/virtualenv || exit 1
+$MAKE -C build/virtualenv MACOSX_DEPLOYMENT_TARGET=  || exit 1
 
 # Generate a JSON config file for unittest harnesses etc to read
 # build configuration details from in a standardized way.
 OS_TARGET=${OS_TARGET} TARGET_CPU=${TARGET_CPU} MOZ_DEBUG=${MOZ_DEBUG} \
 MOZ_WIDGET_TOOLKIT=${MOZ_WIDGET_TOOLKIT} UNIVERSAL_BINARY=${UNIVERSAL_BINARY} \
   $PYTHON ${_topsrcdir}/config/writemozinfo.py ./mozinfo.json.tmp
 if cmp -s ./mozinfo.json.tmp ./mozinfo.json; then
   rm ./mozinfo.json.tmp