Bug 585818 - Export CPU_ARCH and define INTEL_ARCHITECTURE to the build. r=khuey, a2.0=bsmedberg

--HG--
extra : rebase_source : 70993b47ea8843a02dc2143e344ecd40412ece39
This commit is contained in:
Justin Lebar 2010-08-11 16:49:42 -07:00
parent b33e662da2
commit 21f099bac3
4 changed files with 24 additions and 0 deletions

View File

@ -606,6 +606,8 @@ OS_TARGET=@OS_TARGET@
OS_ARCH=@OS_ARCH@
OS_RELEASE=@OS_RELEASE@
OS_TEST=@OS_TEST@
CPU_ARCH=@CPU_ARCH@
INTEL_ARCHITECTURE=@INTEL_ARCHITECTURE@
# For Solaris build
SOLARIS_SUNPRO_CC = @SOLARIS_SUNPRO_CC@

View File

@ -1563,6 +1563,14 @@ if test -z "$OS_TARGET"; then
fi
OS_CONFIG="${OS_TARGET}${OS_RELEASE}"
dnl Set INTEL_ARCHITECTURE if we're compiling for x86-32 or x86-64.
dnl ===============================================================
INTEL_ARCHITECTURE=
case "$OS_TEST" in
x86_64|i?86)
INTEL_ARCHITECTURE=1
esac
dnl ========================================================
dnl GNU specific defaults
dnl ========================================================
@ -9122,6 +9130,8 @@ AC_SUBST(OS_TARGET)
AC_SUBST(OS_ARCH)
AC_SUBST(OS_RELEASE)
AC_SUBST(OS_TEST)
AC_SUBST(CPU_ARCH)
AC_SUBST(INTEL_ARCHITECTURE)
AC_SUBST(MOZ_DISABLE_JAR_PACKAGING)
AC_SUBST(MOZ_CHROME_FILE_FORMAT)

View File

@ -295,6 +295,8 @@ OS_TARGET=@OS_TARGET@
OS_ARCH=@OS_ARCH@
OS_RELEASE=@OS_RELEASE@
OS_TEST=@OS_TEST@
CPU_ARCH=@CPU_ARCH@
INTEL_ARCHITECTURE=@INTEL_ARCHITECTURE@
# For Solaris build
SOLARIS_SUNPRO_CC = @SOLARIS_SUNPRO_CC@

View File

@ -1539,6 +1539,14 @@ if test -z "$OS_TARGET"; then
fi
OS_CONFIG="${OS_TARGET}${OS_RELEASE}"
dnl Set INTEL_ARCHITECTURE if we're compiling for x86-32 or x86-64.
dnl ===============================================================
INTEL_ARCHITECTURE=
case "$OS_TEST" in
x86_64|i?86)
INTEL_ARCHITECTURE=1
esac
dnl ========================================================
dnl GNU specific defaults
dnl ========================================================
@ -5745,6 +5753,8 @@ AC_SUBST(OS_TARGET)
AC_SUBST(OS_ARCH)
AC_SUBST(OS_RELEASE)
AC_SUBST(OS_TEST)
AC_SUBST(CPU_ARCH)
AC_SUBST(INTEL_ARCHITECTURE)
AC_SUBST(WRAP_MALLOC_CFLAGS)
AC_SUBST(WRAP_MALLOC_LIB)