summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWan-Teh Chang <wtc@google.com>2014-08-05 16:35:31 -0700
committerWan-Teh Chang <wtc@google.com>2014-08-05 16:35:31 -0700
commitbaef80d9b1c1e9f00f3ba2e578c2b89a20a83dd2 (patch)
treeeee2a81df65c945446893b91a7fb72c222b20e97
parent7a03559aca5c6c0f03e8e655440360522101e5f4 (diff)
downloadnspr-hg-NSPR_4_10_7_BETA4.tar.gz
Bug 1043108: Remove -arch:IA32 from non-x86 builds. r=dmajor.NSPR_4_10_7_BETA4
-rwxr-xr-xconfigure7
1 files changed, 3 insertions, 4 deletions
diff --git a/configure b/configure
index 4303318b..628ff81d 100755
--- a/configure
+++ b/configure
@@ -7174,10 +7174,6 @@ $as_echo "$as_me: WARNING: Unknown version of the Microsoft (R) Manifest Tool."
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"
@@ -7273,6 +7269,9 @@ $as_echo "$as_me: WARNING: Unknown version of the Microsoft (R) Manifest Tool."
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)