uname -m returns amd64, not x86_86.

Reported and tested by Blair Sadewitz (blair.sadewitz at gmail dot com)
This commit is contained in:
hubertf 2006-12-01 10:55:24 +00:00
parent 25f8ff738b
commit cdfb109833
2 changed files with 4 additions and 4 deletions

View file

@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.8 2006/09/09 02:43:09 obache Exp $
# $NetBSD: Makefile,v 1.9 2006/12/01 10:55:24 hubertf Exp $
DISTNAME= js-1.5
PKGNAME= ${DISTNAME:S/js/spidermonkey/}
PKGREVISION= 4
PKGREVISION= 5
CATEGORIES= lang
MASTER_SITES= http://ftp.mozilla.org/pub/mozilla.org/js/

View file

@ -54,7 +54,7 @@ MKSHLIB = $(LD) -shared $(XMKSHLIBOPTS)
CPU_ARCH = $(shell uname -m)
# don't filter in x86-64 architecture
ifneq (x86_64,$(CPU_ARCH))
ifneq (amd64,$(CPU_ARCH))
ifeq (86,$(findstring 86,$(CPU_ARCH)))
CPU_ARCH = x86
OS_CFLAGS+= -DX86_LINUX
@ -90,7 +90,7 @@ endif
# Use the editline library to provide line-editing support.
JS_EDITLINE = 1
ifeq ($(CPU_ARCH),x86_64)
ifeq ($(CPU_ARCH),amd64)
# Use VA_COPY() standard macro on x86-64
# FIXME: better use it everywhere
OS_CFLAGS += -DHAVE_VA_COPY -DVA_COPY=va_copy