From 0bed81517c75cb4d4d6b8c5121488881278af6d8 Mon Sep 17 00:00:00 2001 From: imp Date: Thu, 12 Mar 2015 08:32:24 +0000 Subject: TARGET_* shouldn't be used here. Use MACHINE_* instead. --- usr.bin/xlint/Makefile.inc | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'usr.bin') diff --git a/usr.bin/xlint/Makefile.inc b/usr.bin/xlint/Makefile.inc index a59b16c..2bd511c 100644 --- a/usr.bin/xlint/Makefile.inc +++ b/usr.bin/xlint/Makefile.inc @@ -5,18 +5,10 @@ WARNS?= 0 .PATH: ${.CURDIR}/../common -# 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/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb|hf)?/arm/} +.if exists(${.CURDIR}/../arch/${MACHINE_ARCH}) +CFLAGS+= -I${.CURDIR}/../arch/${MACHINE_ARCH} .else -TARGET_CPUARCH= ${MACHINE_CPUARCH} -TARGET_ARCH= ${MACHINE_ARCH} -.endif -.if exists(${.CURDIR}/../arch/${TARGET_ARCH}) -CFLAGS+= -I${.CURDIR}/../arch/${TARGET_ARCH} -.else -CFLAGS+= -I${.CURDIR}/../arch/${TARGET_CPUARCH} +CFLAGS+= -I${.CURDIR}/../arch/${MACHINE_CPUARCH} .endif CFLAGS+= -I${.CURDIR}/../common -- cgit v1.1