зеркало из https://github.com/mozilla/gecko-dev.git
Bug 462427 - Stop requiring CROSS_COMPILE being set. r=ted
This commit is contained in:
Родитель
33bd338597
Коммит
80e79be833
|
@ -191,7 +191,6 @@ case "$target" in
|
||||||
ANDROID_PLATFORM="${android_platform}"
|
ANDROID_PLATFORM="${android_platform}"
|
||||||
|
|
||||||
AC_DEFINE(ANDROID)
|
AC_DEFINE(ANDROID)
|
||||||
CROSS_COMPILE=1
|
|
||||||
AC_SUBST(ANDROID_NDK)
|
AC_SUBST(ANDROID_NDK)
|
||||||
AC_SUBST(ANDROID_TOOLCHAIN)
|
AC_SUBST(ANDROID_TOOLCHAIN)
|
||||||
AC_SUBST(ANDROID_PLATFORM)
|
AC_SUBST(ANDROID_PLATFORM)
|
||||||
|
|
|
@ -134,6 +134,7 @@ AC_CHECK_PROGS(LD, "${target_alias}-ld" "${target}-ld", :)
|
||||||
AC_CHECK_PROGS(STRIP, "${target_alias}-strip" "${target}-strip", :)
|
AC_CHECK_PROGS(STRIP, "${target_alias}-strip" "${target}-strip", :)
|
||||||
AC_CHECK_PROGS(WINDRES, "${target_alias}-windres" "${target}-windres", :)
|
AC_CHECK_PROGS(WINDRES, "${target_alias}-windres" "${target}-windres", :)
|
||||||
AC_DEFINE(CROSS_COMPILE)
|
AC_DEFINE(CROSS_COMPILE)
|
||||||
|
CROSS_COMPILE=1
|
||||||
|
|
||||||
dnl If we cross compile for ppc on Mac OS X x86, cross_compiling will
|
dnl If we cross compile for ppc on Mac OS X x86, cross_compiling will
|
||||||
dnl dnl have erroneously been set to "no", because the x86 build host is
|
dnl dnl have erroneously been set to "no", because the x86 build host is
|
||||||
|
|
|
@ -43,11 +43,6 @@ if test "$MOZ_BUILD_APP" = "i386" -o "$MOZ_BUILD_APP" = "x86_64"; then
|
||||||
LD=ld
|
LD=ld
|
||||||
STRIP="strip"
|
STRIP="strip"
|
||||||
|
|
||||||
# Let configure know that we mean business.
|
|
||||||
if test "$NATIVE_CPU" != "$TARGET_CPU" ; then
|
|
||||||
CROSS_COMPILE=1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Each per-CPU build should be entirely oblivious to the fact that a
|
# Each per-CPU build should be entirely oblivious to the fact that a
|
||||||
# universal binary will be produced. The exception is packager.mk, which
|
# universal binary will be produced. The exception is packager.mk, which
|
||||||
# needs to know to look for universal bits when building the .dmg.
|
# needs to know to look for universal bits when building the .dmg.
|
||||||
|
|
|
@ -5,6 +5,7 @@ if test `uname -m` = "x86_64"; then
|
||||||
CC="$CC -m32 -march=pentiumpro"
|
CC="$CC -m32 -march=pentiumpro"
|
||||||
CXX="$CXX -m32 -march=pentiumpro"
|
CXX="$CXX -m32 -march=pentiumpro"
|
||||||
ac_add_options --target=i686-pc-linux
|
ac_add_options --target=i686-pc-linux
|
||||||
|
ac_add_options --host=i686-pc-linux
|
||||||
ac_add_options --x-libraries=/usr/lib
|
ac_add_options --x-libraries=/usr/lib
|
||||||
export PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/share/pkgconfig
|
export PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/share/pkgconfig
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -287,7 +287,6 @@ if test -n "$gonkdir" ; then
|
||||||
AC_SUBST(ANDROID_VERSION)
|
AC_SUBST(ANDROID_VERSION)
|
||||||
AC_DEFINE(HAVE_SYS_UIO_H)
|
AC_DEFINE(HAVE_SYS_UIO_H)
|
||||||
AC_DEFINE(HAVE_PTHREADS)
|
AC_DEFINE(HAVE_PTHREADS)
|
||||||
CROSS_COMPILE=1
|
|
||||||
MOZ_CHROME_FILE_FORMAT=omni
|
MOZ_CHROME_FILE_FORMAT=omni
|
||||||
direct_nspr_config=1
|
direct_nspr_config=1
|
||||||
else
|
else
|
||||||
|
@ -314,16 +313,13 @@ AC_SUBST(OBJCOPY)
|
||||||
dnl ========================================================
|
dnl ========================================================
|
||||||
dnl Checks for compilers.
|
dnl Checks for compilers.
|
||||||
dnl ========================================================
|
dnl ========================================================
|
||||||
dnl Set CROSS_COMPILE in the environment when running configure
|
|
||||||
dnl to use the cross-compile setup for now
|
|
||||||
dnl ========================================================
|
|
||||||
|
|
||||||
dnl AR_FLAGS set here so HOST_AR_FLAGS can be set correctly (see bug 538269)
|
dnl AR_FLAGS set here so HOST_AR_FLAGS can be set correctly (see bug 538269)
|
||||||
AR_FLAGS='crs $@'
|
AR_FLAGS='crs $@'
|
||||||
|
|
||||||
if test "$COMPILE_ENVIRONMENT"; then
|
if test "$COMPILE_ENVIRONMENT"; then
|
||||||
|
|
||||||
if test -n "$CROSS_COMPILE" -a "$target" != "$host"; then
|
if test "$target" != "$host"; then
|
||||||
MOZ_CROSS_COMPILER
|
MOZ_CROSS_COMPILER
|
||||||
else
|
else
|
||||||
AC_PROG_CC
|
AC_PROG_CC
|
||||||
|
|
|
@ -228,7 +228,6 @@ if test -n "$gonkdir" ; then
|
||||||
|
|
||||||
AC_DEFINE(ANDROID)
|
AC_DEFINE(ANDROID)
|
||||||
AC_DEFINE(GONK)
|
AC_DEFINE(GONK)
|
||||||
CROSS_COMPILE=1
|
|
||||||
else
|
else
|
||||||
MOZ_ANDROID_NDK
|
MOZ_ANDROID_NDK
|
||||||
fi
|
fi
|
||||||
|
@ -281,9 +280,6 @@ AC_SUBST(MOZJS_ALPHA)
|
||||||
dnl ========================================================
|
dnl ========================================================
|
||||||
dnl Checks for compilers.
|
dnl Checks for compilers.
|
||||||
dnl ========================================================
|
dnl ========================================================
|
||||||
dnl Set CROSS_COMPILE in the environment when running configure
|
|
||||||
dnl to use the cross-compile setup for now
|
|
||||||
dnl ========================================================
|
|
||||||
|
|
||||||
dnl AR_FLAGS set here so HOST_AR_FLAGS can be set correctly (see bug 538269)
|
dnl AR_FLAGS set here so HOST_AR_FLAGS can be set correctly (see bug 538269)
|
||||||
AR_FLAGS='crs $@'
|
AR_FLAGS='crs $@'
|
||||||
|
@ -554,12 +550,6 @@ fi
|
||||||
|
|
||||||
fi # COMPILE_ENVIRONMENT
|
fi # COMPILE_ENVIRONMENT
|
||||||
|
|
||||||
if test "$cross_compiling" = "yes"; then
|
|
||||||
CROSS_COMPILE=1
|
|
||||||
else
|
|
||||||
CROSS_COMPILE=
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Check to see if we are running in a broken QEMU scratchbox.
|
# Check to see if we are running in a broken QEMU scratchbox.
|
||||||
# We know that anything below 1.0.16 is broken.
|
# We know that anything below 1.0.16 is broken.
|
||||||
AC_CHECK_PROGS(SBCONF, sb-conf ve, "")
|
AC_CHECK_PROGS(SBCONF, sb-conf ve, "")
|
||||||
|
|
Загрузка…
Ссылка в новой задаче