Bug 1043108: Remove -arch:IA32 from non-x86 builds. r=dmajor. NSPR_4_10_7_BETA4
authorWan-Teh Chang <wtc@google.com>
Tue, 05 Aug 2014 16:35:31 -0700
changeset 4587 1a9eb31b1e6f4533fb36a9e32db3d7c15a0d2d41
parent 4586 42d9fa709ca260cc295fed6847c9008ecb759b73
child 4588 c9f79fae187d33e7bc8c55610545c32f11b66e5e
push id131
push userwtc@google.com
push dateTue, 05 Aug 2014 23:35:38 +0000
reviewersdmajor
bugs1043108
Bug 1043108: Remove -arch:IA32 from non-x86 builds. r=dmajor.
configure
--- a/configure
+++ b/configure
@@ -7169,20 +7169,16 @@ tools are selected during the Xcode/Deve
         _DEBUG_FLAGS=-Zi
         _OPTIMIZE_FLAGS=-O2
 
         PROFILE_GEN_CFLAGS="-GL"
         PROFILE_GEN_LDFLAGS="-LTCG:PGINSTRUMENT"
         PROFILE_USE_CFLAGS="-GL -wd4624 -wd4952"
         PROFILE_USE_LDFLAGS="-LTCG:PGUPDATE"
 
-        if test "$MSC_VER" -ge "1700"; then
-                                    CFLAGS="$CFLAGS -arch:IA32"
-        fi
-
         if test "$MSC_VER" -ge "1800"; then
                                                 CFLAGS="$CFLAGS -FS"
                                     PROFILE_GEN_CFLAGS="$PROFILE_GEN_CFLAGS -Gw"
             PROFILE_USE_CFLAGS="$PROFILE_USE_CFLAGS -Gw"
         fi
 
         if test -z "$MOZ_OPTIMIZE"; then
             CFLAGS="$CFLAGS -Od"
@@ -7268,16 +7264,19 @@ tools are selected during the Xcode/Deve
     case "$target_cpu" in
     i*86)
 	if test -n "$USE_64"; then
 	    $as_echo "#define _AMD64_ 1" >>confdefs.h
 
 	else
 	    $as_echo "#define _X86_ 1" >>confdefs.h
 
+            if test -z "$GNU_CC" -a "$MSC_VER" -ge "1700"; then
+                                                CFLAGS="$CFLAGS -arch:IA32"
+            fi
 	fi
         ;;
     x86_64)
 	    $as_echo "#define _AMD64_ 1" >>confdefs.h
 
 	    USE_64=1
 	    ;;
     ia64)