diff options
| author | imp <imp@FreeBSD.org> | 2010-09-13 06:35:35 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2010-09-13 06:35:35 +0000 |
| commit | e71de0e512cb886d5290ed9b12ba52bdfde06200 (patch) | |
| tree | 67685c6e3d57108be209362fa54122593a7ca933 /usr.bin/xlint/Makefile.inc | |
| parent | 1b35612118ef4e6ca7fc7d5bedb931152eb66eff (diff) | |
| download | FreeBSD-src-e71de0e512cb886d5290ed9b12ba52bdfde06200.zip FreeBSD-src-e71de0e512cb886d5290ed9b12ba52bdfde06200.tar.gz | |
Revert r212513 and reimplement the search order to be ARCH, CPUARCH
Diffstat (limited to 'usr.bin/xlint/Makefile.inc')
| -rw-r--r-- | usr.bin/xlint/Makefile.inc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/usr.bin/xlint/Makefile.inc b/usr.bin/xlint/Makefile.inc index f4956ab..ebdcbe3 100644 --- a/usr.bin/xlint/Makefile.inc +++ b/usr.bin/xlint/Makefile.inc @@ -7,14 +7,17 @@ WARNS?= 0 # These assignments duplicate much of the functionality of # MACHINE_CPUARCH, but there's no easy way to export make functions... - .if defined(TARGET_ARCH) -TARGET_CPUARCH=${TARGET_ARCH:C/mipse[bl]/mips/:C/armeb/arm/} +TARGET_CPUARCH= ${TARGET_ARCH:C/mipse[bl]/mips/:C/armeb/arm/} .else -TARGET_CPUARCH=${MACHINE_CPUARCH} +TARGET_CPUARCH= ${MACHINE_CPUARCH} +TARGET_ARCH= ${MACHINE_ARCH} .endif -TARGET_ARCH?= ${MACHINE_ARCH} +.if exists(${.CURDIR}/../arch/${TARGET_ARCH} +CFLAGS+= -I${.CURDIR}/../arch/${TARGET_ARCH} +.else CFLAGS+= -I${.CURDIR}/../arch/${TARGET_CPUARCH} +.enidf CFLAGS+= -I${.CURDIR}/../common OBJECT_FMT= ELF |
