summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkaie%kuix.de <devnull@localhost>2008-08-14 18:55:05 +0000
committerkaie%kuix.de <devnull@localhost>2008-08-14 18:55:05 +0000
commit22f9e9e235bd383f40b22abd250dec9f96f5e231 (patch)
tree079d1131827cc1a8cb78608cf6c3e9496397746a
parent084043b8748fba6f1c3df046858bcab7d6eb94cf (diff)
downloadnss-hg-22f9e9e235bd383f40b22abd250dec9f96f5e231.tar.gz
Bug 330628, coreconf/Linux.mk should _not_ default to x86 but result in an error if host is not recognizedNSS_3_12_1_RC1FIREFOX_3_0_2_BUILD4FIREFOX_3_0_2_BUILD3FIREFOX_3_0_2_BUILD2FIREFOX_3_0_2_BUILD1
Patch by Mike Hommey and Wan-Teh Chang r=rrelyea, r=kaie
-rw-r--r--security/coreconf/Linux.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/security/coreconf/Linux.mk b/security/coreconf/Linux.mk
index 765fe2171..18aa1a1ad 100644
--- a/security/coreconf/Linux.mk
+++ b/security/coreconf/Linux.mk
@@ -117,8 +117,13 @@ ifeq ($(OS_TEST),mips)
OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
CPU_ARCH = mips
else
+ifeq (,$(filter-out i%86,$(OS_TEST)))
OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE
CPU_ARCH = x86
+else
+ OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
+ CPU_ARCH = $(OS_TEST)
+endif
endif
endif
endif