summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--gnu/lib/csu/Makefile6
-rw-r--r--sys/modules/svr4/Makefile4
-rw-r--r--usr.sbin/amd/Makefile.inc3
3 files changed, 4 insertions, 9 deletions
diff --git a/gnu/lib/csu/Makefile b/gnu/lib/csu/Makefile
index 2ba52fe..3426800 100644
--- a/gnu/lib/csu/Makefile
+++ b/gnu/lib/csu/Makefile
@@ -2,9 +2,7 @@
GCCDIR= ${.CURDIR}/../../../contrib/gcc.295
-TARGET_ARCH?= ${MACHINE_ARCH}
-
-.if ${TARGET_ARCH} == "alpha"
+.if ${MACHINE_ARCH} == "alpha"
.PATH: ${GCCDIR}/config/alpha
SRCS= crtbegin.s crtend.s
UGLYHACK= -x assembler
@@ -28,7 +26,7 @@ CRTS_CFLAGS= -DCRTSTUFFS_O ${PICFLAG}
all: ${OBJS} ${SOBJS}
-.if ${TARGET_ARCH} == "alpha"
+.if ${MACHINE_ARCH} == "alpha"
crtbegin.o crtbegin.So: crtbegin.s
crtend.o crtend.So: crtend.s
.for PART in begin end
diff --git a/sys/modules/svr4/Makefile b/sys/modules/svr4/Makefile
index 47dd0da..1057f30 100644
--- a/sys/modules/svr4/Makefile
+++ b/sys/modules/svr4/Makefile
@@ -2,9 +2,7 @@
MAINTAINER= newton@FreeBSD.org
-TARGET_ARCH?= ${MACHINE_ARCH}
-
-.PATH: ${.CURDIR}/../../${TARGET_ARCH}/svr4 ${.CURDIR}/../../compat/svr4
+.PATH: ${.CURDIR}/../../${MACHINE_ARCH}/svr4 ${.CURDIR}/../../compat/svr4
KMOD= svr4
SRCS= svr4_sysent.c svr4_sysvec.c opt_compat.h opt_svr4.h opt_vmpage.h \
vnode_if.h imgact_svr4.c svr4_signal.c svr4_fcntl.c svr4_misc.c \
diff --git a/usr.sbin/amd/Makefile.inc b/usr.sbin/amd/Makefile.inc
index 3ded149..fb29b81 100644
--- a/usr.sbin/amd/Makefile.inc
+++ b/usr.sbin/amd/Makefile.inc
@@ -18,8 +18,7 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/amd/include
CFLAGS+= -I${.CURDIR}/../../../contrib/amd
CFLAGS+= -DHAVE_CONFIG_H
-TARGET_ARCH?= ${MACHINE_ARCH}
-CFLAGS+= -DHOST_CPU=\"${TARGET_ARCH}\" -DHOST_ARCH=\"${TARGET_ARCH}\"
+CFLAGS+= -DHOST_CPU=\"${MACHINE_ARCH}\" -DHOST_ARCH=\"${MACHINE_ARCH}\"
.if exists(${.OBJDIR}/../libamu)
LIBAMUDIR= ${.OBJDIR}/../libamu
OpenPOWER on IntegriCloud