bug 1174749 - remove nspr ios configure bit. r=wtc NSPR_4_10_9_BETA3
authorTed Mielczarek <ted@mielczarek.org>
Tue, 14 Apr 2015 15:30:36 -0400
changeset 4641 25dc5f36603f7091eac40cc6c975db40151728cd
parent 4640 e2177b7f79f56d2381d58bbd20492847fc4f0f9f
child 4642 9ff4adeb21681f2d4ab292820b9851bca9895fa1
push id177
push usertmielczarek@mozilla.com
push dateTue, 04 Aug 2015 18:38:34 +0000
reviewerswtc
bugs1174749
bug 1174749 - remove nspr ios configure bit. r=wtc
configure
configure.in
--- a/configure
+++ b/configure
@@ -3121,22 +3121,16 @@ if test "$target" != "$host"; then
 
     case "$build:$target" in
       powerpc-apple-darwin8*:i?86-apple-darwin*)
                                                 _SAVE_CFLAGS=$CFLAGS
         _SAVE_CXXFLAGS=$CXXFLAGS
         CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk $CFLAGS"
         CXXFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk $CXXFLAGS"
         ;;
-      *:arm*-apple-darwin*)
-                                _SAVE_CFLAGS=$CFLAGS
-        _SAVE_CXXFLAGS=$CXXFLAGS
-        CFLAGS="-isysroot $MACOS_SDK_DIR $CFLAGS"
-        CXXFLAGS="-isysroot $MACOS_SDK_DIR $CXXFLAGS"
-        ;;
     esac
 
     for ac_prog in $CC "${target_alias}-gcc" "${target}-gcc"
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
--- a/configure.in
+++ b/configure.in
@@ -563,25 +563,16 @@ if test "$target" != "$host"; then
         dnl to the system root.  The libraries in the system root on current
         dnl versions of PPC OS X 10.4 aren't fat, so these target compiler
         dnl checks will fail.  Fake a working SDK in that case.
         _SAVE_CFLAGS=$CFLAGS
         _SAVE_CXXFLAGS=$CXXFLAGS
         CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk $CFLAGS"
         CXXFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk $CXXFLAGS"
         ;;
-      *:arm*-apple-darwin*)
-        dnl The arm compiler doesn't appear to know about its root by default,
-        dnl so explicitly pass it one here. Later on we'll put this in CFLAGS
-        dnl anyway.
-        _SAVE_CFLAGS=$CFLAGS
-        _SAVE_CXXFLAGS=$CXXFLAGS
-        CFLAGS="-isysroot $MACOS_SDK_DIR $CFLAGS"
-        CXXFLAGS="-isysroot $MACOS_SDK_DIR $CXXFLAGS"
-        ;;
     esac
 
     AC_CHECK_PROGS(CC, $CC "${target_alias}-gcc" "${target}-gcc", echo)
     unset ac_cv_prog_CC
     dnl Now exit the conditional block to invoke AC_PROG_CC.
 fi
 
 dnl In the latest versions of autoconf, AC_PROG_CC is a one-shot macro,