summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2010-05-24 17:40:34 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2010-05-24 17:40:34 +0000
commit641062de2e1f3e70781a79725d7c473206ff3913 (patch)
tree7cfed576f2dc8be397c10b0eafdfc388ee4a601e /sys/arch
parent486e5d0208fc8567d538400ad60c638b3254d7bc (diff)
CPP and TOUCH are not used
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/loongson/conf/Makefile.loongson9
-rw-r--r--sys/arch/sgi/conf/Makefile.sgi7
2 files changed, 6 insertions, 10 deletions
diff --git a/sys/arch/loongson/conf/Makefile.loongson b/sys/arch/loongson/conf/Makefile.loongson
index 9cef0bebbaf..50deedaded2 100644
--- a/sys/arch/loongson/conf/Makefile.loongson
+++ b/sys/arch/loongson/conf/Makefile.loongson
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.loongson,v 1.19 2010/05/24 14:59:15 deraadt Exp $
+# $OpenBSD: Makefile.loongson,v 1.20 2010/05/24 17:40:33 deraadt Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -15,13 +15,10 @@ SIZE?= size
STRIP?= strip
AS?= as
CC?= cc
-CPP?= cpp
LD?= ld ${ENDIAN}
-TOUCH?= touch
-CPP+=${ENDIAN}
-CC+=${ENDIAN}
AS+=${ENDIAN}
+CC+=${ENDIAN}
LD+=${ENDIAN}
# source tree is located via $S relative to the compilation directory
@@ -157,7 +154,9 @@ depend:: .depend
.depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO}
${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/${_mach}/locore.S
${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
+.if !empty(SFILES)
${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
+.endif
cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \
sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} ${CPPFLAGS}
@sed -e 's/.*\.o: /assym.h: /' -e 's/\/tmp\/genassym_c.[^ ]*//' \
diff --git a/sys/arch/sgi/conf/Makefile.sgi b/sys/arch/sgi/conf/Makefile.sgi
index 864e4c5c128..3c37dd5ea60 100644
--- a/sys/arch/sgi/conf/Makefile.sgi
+++ b/sys/arch/sgi/conf/Makefile.sgi
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.sgi,v 1.40 2010/05/24 14:59:16 deraadt Exp $
+# $OpenBSD: Makefile.sgi,v 1.41 2010/05/24 17:40:33 deraadt Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -15,13 +15,10 @@ SIZE?= size
STRIP?= strip
AS?= as
CC?= cc
-CPP?= cpp
LD?= ld ${ENDIAN}
-TOUCH?= touch
-CPP+=${ENDIAN}
-CC+=${ENDIAN}
AS+=${ENDIAN}
+CC+=${ENDIAN}
LD+=${ENDIAN}
# source tree is located via $S relative to the compilation directory