commit bf4dbc4f4bbab9f8b544a808c5f6697abe5e01f1 Author: Konstantin A. Lepikhov Date: Mon Nov 20 22:49:14 2006 +0300 Remove CROSS_COMPILE checks due problems with OS_TEST autoguessing during %%ix86 cross-build on x86_64 host. diff --git a/mozilla/configure.in b/mozilla/configure.in index 8dbce92..10f6392 100644 --- a/mozilla/configure.in +++ b/mozilla/configure.in @@ -821,24 +821,18 @@ GFXWIN_DLL='\"libgfx_$(MOZ_GFX_TOOLKIT)$ MOZ_ENABLE_POSTSCRIPT=1 -if test -n "$CROSS_COMPILE"; then - OS_TARGET="${target_os}" - OS_ARCH=`echo $target_os | sed -e 's|/|_|g'` - OS_RELEASE= - OS_TEST="${target_cpu}" - case "${target_os}" in - linux*) OS_ARCH=Linux ;; - solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;; - mingw*) OS_ARCH=WINNT ;; - wince*) OS_ARCH=WINCE ;; - darwin*) OS_ARCH=Darwin OS_TARGET=Darwin ;; - esac -else - OS_TARGET=`uname -s` - OS_ARCH=`uname -s | sed -e 's|/|_|g'` - OS_RELEASE=`uname -r` - OS_TEST=`uname -m` -fi +OS_TARGET="${target_os}" +OS_ARCH=`echo $target_os | sed -e 's|/|_|g'` +OS_RELEASE= +OS_TEST="${target_cpu}" +case "${target_os}" in + linux*) OS_ARCH=Linux ;; + solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;; + mingw*) OS_ARCH=WINNT ;; + wince*) OS_ARCH=WINCE ;; + darwin*) OS_ARCH=Darwin OS_TARGET=Darwin ;; +esac + _COMPILER_PREFIX= HOST_OS_ARCH=`echo $host_os | sed -e 's|/|_|g'`