Fixed build for sb2 target

embedding/embedlite/config/mozconfig.merqtxulfennec

@@ -1,7 +1,6 @@
 export ac_cv_have_usable_wchar_option_v2="no"
 export CFLAGS="-O3"
 export CXXFLAGS="-O3"
-export CROSS_COMPILE=1
 export MOZ_DEBUG_SYMBOLS=1
 export MOZILLA_OFFICIAL=1
 

embedding/embedlite/config/mozconfig.merqtxulrunner

@@ -3,7 +3,6 @@ export CFLAGS="-O3"
 export CXXFLAGS="-O3"
 export MOZ_DEBUG_SYMBOLS=1
 export MOZILLA_OFFICIAL=1
-export CROSS_COMPILE=1
 
 mk_add_options PROFILE_GEN_SCRIPT=@TOPSRCDIR@/build/profile_pageloader.pl
 mk_add_options MOZ_MAKE_FLAGS="-j8"

nsprpub/configure

@@ -3110,7 +3110,8 @@ else
 fi
 
 if test -z "$SKIP_COMPILER_CHECKS"; then
-if test "$target" != "$host"; then
+
+if test "$target" != "$host" -o -n "$CROSS_COMPILE"; then
     echo "cross compiling from $host to $target"
     cross_compiling=yes
 
@@ -3966,7 +3967,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-if test "$target" != "$host"; then
+if test "$target" != "$host" -o -n "$CROSS_COMPILE"; then
     if test -n "$USE_CPLUS"; then
         for ac_prog in $CXX "${target_alias}-g++" "${target}-g++"
 do

nsprpub/configure.in

@@ -569,7 +569,11 @@ if test -z "$SKIP_COMPILER_CHECKS"; then
 dnl ========================================================
 dnl Checks for compilers.
 dnl ========================================================
-if test "$target" != "$host"; then
+
+dnl Explicitly honor $CROSS_COMPILE to allow cross-compiling
+dnl between toolkits on the same architecture, as when
+dnl targeting the iOS Simulator from OS X.
+if test "$target" != "$host" -o -n "$CROSS_COMPILE"; then
     echo "cross compiling from $host to $target"
     cross_compiling=yes
 
@@ -608,7 +612,7 @@ dnl and before invoking AC_TRY_COMPILE (which requires AC_PROG_CC).
 AC_PROG_CC
 
 dnl Reenter the conditional blocks after invoking AC_PROG_CC.
-if test "$target" != "$host"; then
+if test "$target" != "$host" -o -n "$CROSS_COMPILE"; then
     if test -n "$USE_CPLUS"; then
         AC_CHECK_PROGS(CXX, $CXX "${target_alias}-g++" "${target}-g++", echo)
         unset ac_cv_prog_CXX