diff options
| author | wtc%google.com <devnull@localhost> | 2009-08-22 05:33:09 +0000 |
|---|---|---|
| committer | wtc%google.com <devnull@localhost> | 2009-08-22 05:33:09 +0000 |
| commit | d98d79f82186a76e421552a6169e3877b9ff7a8e (patch) | |
| tree | 2ede4c56af778d879616bece20a56c6cf81f1392 | |
| parent | 747353e62a042a9a623ad78d331b9bb626b33e87 (diff) | |
| download | nss-hg-d98d79f82186a76e421552a6169e3877b9ff7a8e.tar.gz | |
Bug 511227: Set CPU_ARCH appropriately. The patch is contributed by
chmeeedalf@gmail.com. r=wtc.
| -rw-r--r-- | security/coreconf/FreeBSD.mk | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/security/coreconf/FreeBSD.mk b/security/coreconf/FreeBSD.mk index 0b3d825ae..8d1dad7a5 100644 --- a/security/coreconf/FreeBSD.mk +++ b/security/coreconf/FreeBSD.mk @@ -42,11 +42,16 @@ CC = gcc CCC = g++ RANLIB = ranlib -ifeq ($(OS_TEST),alpha) -CPU_ARCH = alpha -else +CPU_ARCH = $(OS_TEST) +ifeq ($(CPU_ARCH),i386) +CPU_ARCH = x86 +endif +ifeq ($(CPU_ARCH),pc98) CPU_ARCH = x86 endif +ifeq ($(CPU_ARCH),amd64) +CPU_ARCH = x86_64 +endif OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK |