diff options
| author | kaie%kuix.de <devnull@localhost> | 2008-08-14 13:06:42 +0000 |
|---|---|---|
| committer | kaie%kuix.de <devnull@localhost> | 2008-08-14 13:06:42 +0000 |
| commit | 6167f8ce9c2e80b498abc87a817290502feef8c3 (patch) | |
| tree | d2de7cf8ef4b70195acd0ceec1a9382dab1582a2 | |
| parent | e8b78180dfc8ad1ee498bfe324443ce2a3e51112 (diff) | |
| download | nss-hg-6167f8ce9c2e80b498abc87a817290502feef8c3.tar.gz | |
Bug 330628, coreconf/Linux.mk should _not_ default to x86 but result in an error if host is not recognized.
r=relyea
| -rw-r--r-- | security/coreconf/Linux.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/security/coreconf/Linux.mk b/security/coreconf/Linux.mk index 765fe2171..13281ddfc 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 i686 i586 i486 i386,$(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 |