Bug 674647 - Set MOZ_CAN_RUN_PROGRAMS in mozconfig.leopard and propagate it. r=khuey.
authorRafael Ávila de Espíndola <respindola@mozilla.com>
Sun, 18 Sep 2011 14:43:31 -0400
changeset 78434 90de3b7ddca9930c0e5a3b4151334ed6d3e8a265
parent 78433 3610977e5f7e34593f78c8cceba56e491a07bf3e
child 78435 2cef60b8a9c26a2632b688727c35ec03875fd8a5
push id78
push userclegnitto@mozilla.com
push dateFri, 16 Dec 2011 17:32:24 +0000
treeherdermozilla-release@79d24e644fdd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey
bugs674647
milestone9.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 674647 - Set MOZ_CAN_RUN_PROGRAMS in mozconfig.leopard and propagate it. r=khuey. This patch sets MOZ_CAN_RUN_PROGRAMS in mozconfig.leopard so that the build system knows it can run programs when producing 32 bit dmg files in a 64 bit host (10.6). The patch also propagates MOZ_CAN_RUN_PROGRAMS from the configure system to Makefile.
build/macosx/mozconfig.leopard
config/autoconf.mk.in
configure.in
js/src/config/autoconf.mk.in
js/src/configure.in
--- a/build/macosx/mozconfig.leopard
+++ b/build/macosx/mozconfig.leopard
@@ -15,16 +15,18 @@ HOST_CXX=$CXX
 
 # These must be set for cross builds, and don't hurt straight builds.
 RANLIB=ranlib
 AR=ar
 AS=$CC
 LD=ld
 STRIP="strip -x -S"
 
+MOZ_CAN_RUN_PROGRAMS=1
+
 # We do 32 bit builds for leopard
 TARGET_CPU=i386
 CC="$CC -arch $TARGET_CPU"
 CXX="$CXX -arch $TARGET_CPU"
 
 NATIVE_CPU=`$topsrcdir/build/autoconf/config.guess | cut -f1 -d-`
 
 if test "$NATIVE_CPU" != "$TARGET_CPU" ; then
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -652,16 +652,17 @@ MOZ_MAEMO_LIBLOCATION 	= @MOZ_MAEMO_LIBL
 MOZ_ENABLE_LIBCONIC = @MOZ_ENABLE_LIBCONIC@
 LIBCONIC_CFLAGS     = @LIBCONIC_CFLAGS@
 LIBCONIC_LIBS       = @LIBCONIC_LIBS@
 
 MACOS_SDK_DIR	= @MACOS_SDK_DIR@
 NEXT_ROOT	= @NEXT_ROOT@
 GCC_VERSION	= @GCC_VERSION@
 UNIVERSAL_BINARY= @UNIVERSAL_BINARY@
+MOZ_CAN_RUN_PROGRAMS = MOZ_CAN_RUN_PROGRAMS@
 HAVE_DTRACE= @HAVE_DTRACE@
 
 VISIBILITY_FLAGS = @VISIBILITY_FLAGS@
 WRAP_SYSTEM_INCLUDES = @WRAP_SYSTEM_INCLUDES@
 
 HAVE_ARM_SIMD = @HAVE_ARM_SIMD@
 HAVE_ARM_NEON = @HAVE_ARM_NEON@
 HAVE_GCC_ALIGN_ARG_POINTER = @HAVE_GCC_ALIGN_ARG_POINTER@
--- a/configure.in
+++ b/configure.in
@@ -1095,18 +1095,20 @@ from building Mozilla. Upgrade to Xcode 
     dnl it has moved into /usr/bin.
     MOZ_PATH_PROG(SDP, sdp, :, [$PATH:/usr/bin:/Developer/Tools])
     ;;
 esac
 
 AC_SUBST(GCC_VERSION)
 
 dnl The universal machinery sets UNIVERSAL_BINARY to inform packager.mk
-dnl that a universal binary is being produced.
+dnl that a universal binary is being produced and MOZ_CAN_RUN_PROGRAMS
+dnl when we can run target binaries.
 AC_SUBST(UNIVERSAL_BINARY)
+AC_SUBST(MOZ_CAN_RUN_PROGRAMS)
 
 dnl ========================================================
 dnl Check for MacOS deployment target version
 dnl ========================================================
 
 MOZ_ARG_ENABLE_STRING(macos-target,
                       [  --enable-macos-target=VER (default=10.5)
                           Set the minimum MacOS version needed at runtime],
--- a/js/src/config/autoconf.mk.in
+++ b/js/src/config/autoconf.mk.in
@@ -327,16 +327,17 @@ MOZ_UTILS_PROGRAM_LDFLAGS = @MOZ_UTILS_P
 MOZ_MAPINFO	= @MOZ_MAPINFO@
 
 QEMU_CANT_RUN_JS_SHELL = @QEMU_CANT_RUN_JS_SHELL@
 
 MACOS_SDK_DIR	= @MACOS_SDK_DIR@
 NEXT_ROOT	= @NEXT_ROOT@
 GCC_VERSION	= @GCC_VERSION@
 UNIVERSAL_BINARY= @UNIVERSAL_BINARY@
+MOZ_CAN_RUN_PROGRAMS = MOZ_CAN_RUN_PROGRAMS@
 HAVE_DTRACE= @HAVE_DTRACE@
 
 VISIBILITY_FLAGS = @VISIBILITY_FLAGS@
 WRAP_SYSTEM_INCLUDES = @WRAP_SYSTEM_INCLUDES@
 
 ENABLE_TRACEJIT = @ENABLE_TRACEJIT@
 ENABLE_METHODJIT = @ENABLE_METHODJIT@
 NANOJIT_ARCH = @NANOJIT_ARCH@
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -1078,18 +1078,20 @@ from building Mozilla. Upgrade to Xcode 
     dnl it has moved into /usr/bin.
     MOZ_PATH_PROG(SDP, sdp, :, [$PATH:/usr/bin:/Developer/Tools])
     ;;
 esac
 
 AC_SUBST(GCC_VERSION)
 
 dnl The universal machinery sets UNIVERSAL_BINARY to inform packager.mk
-dnl that a universal binary is being produced.
+dnl that a universal binary is being produced and MOZ_CAN_RUN_PROGRAMS
+dnl when we can run target binaries.
 AC_SUBST(UNIVERSAL_BINARY)
+AC_SUBST(MOZ_CAN_RUN_PROGRAMS)
 
 dnl ========================================================
 dnl Check for MacOS deployment target version
 dnl ========================================================
 
 MOZ_ARG_ENABLE_STRING(macos-target,
                       [  --enable-macos-target=VER (default=10.5)
                           Set the minimum MacOS version needed at runtime],