Module Name: src
Committed By: mrg
Date: Mon Mar 22 05:12:24 UTC 2010
Modified Files:
src/usr.bin/xlint: Makefile.inc
Log Message:
for mips64*, use mips64 subdir, otherwise use $MACHINE_ARCH if exists,
or $MACHINE_CPU. idea from [email protected] in PR#43021.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/xlint/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/Makefile.inc
diff -u src/usr.bin/xlint/Makefile.inc:1.11 src/usr.bin/xlint/Makefile.inc:1.12
--- src/usr.bin/xlint/Makefile.inc:1.11 Mon Dec 14 00:42:06 2009
+++ src/usr.bin/xlint/Makefile.inc Mon Mar 22 05:12:24 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.11 2009/12/14 00:42:06 matt Exp $
+# $NetBSD: Makefile.inc,v 1.12 2010/03/22 05:12:24 mrg Exp $
WARNS?= 3 # XXX: fails -Wsign-compare
@@ -6,13 +6,12 @@
.PATH: ${.CURDIR}/../common
-# On the m68000, MACHINE_CPU is "m68k", but we have different
-# target parameters (namely, long double is a different size
-# on the m68000), so we special case the directory name here.
-.if ${MACHINE_ARCH} == "m68000"
-ARCHSUBDIR= m68000
-.elif ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
+# Special cases first, then check for a MACHINE_ARCH specific
+# subdir before looking for MACHINE_CPU.
+.if ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el"
ARCHSUBDIR= mips64
+.elif exists(${.CURDIR}/../arch/${MACHINE_ARCH})
+ARCHSUBDIR= ${MACHINE_ARCH}
.else
ARCHSUBDIR= ${MACHINE_CPU}
.endif
