summaryrefslogtreecommitdiff
path: root/sys/arch/landisk/conf
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2010-05-23 16:55:13 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2010-05-23 16:55:13 +0000
commitc7bba62b95f3149dcdc86eba35e134591bfd7188 (patch)
treefd6a3e9e2e30d5627e4db2edd9efb5960cf06a43 /sys/arch/landisk/conf
parent31238690c1255961e2c54890dfb94bf3ec1dad8d (diff)
Does not need -Dlandisk, and instead, but -Dlandisk is nice since that is
the mach (arch is sh). Also move towards passing $PARAM around in CPPFLAGS, instead of compiling param.c in a special way, as discussed with miod
Diffstat (limited to 'sys/arch/landisk/conf')
-rw-r--r--sys/arch/landisk/conf/Makefile.landisk7
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/arch/landisk/conf/Makefile.landisk b/sys/arch/landisk/conf/Makefile.landisk
index e414adc77e9..f6a0c792766 100644
--- a/sys/arch/landisk/conf/Makefile.landisk
+++ b/sys/arch/landisk/conf/Makefile.landisk
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.landisk,v 1.27 2010/04/28 15:31:33 deraadt Exp $
+# $OpenBSD: Makefile.landisk,v 1.28 2010/05/23 16:55:12 deraadt Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -25,7 +25,7 @@ _machdir?= $S/arch/${_mach}
_archdir?= $S/arch/${_arch}
INCLUDES= -nostdinc -I. -I$S -I$S/arch
-CPPFLAGS= ${INCLUDES} ${IDENT} -D_KERNEL -D${_mach}
+CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D__${_mach}__
CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wno-uninitialized -Wno-format -Wno-main \
-Wstack-larger-than-2047 -Wvariable-decl
@@ -58,7 +58,6 @@ HOSTED_CFLAGS= ${CFLAGS}
NORMAL_C_NOP= ${CC} ${CFLAGS} ${CPPFLAGS} -c $<
NORMAL_C= ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
-NORMAL_C_C= ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} -c $<
NORMAL_S_C= ${AS} ${COPTS} ${PARAM} $< -o $@
@@ -106,7 +105,7 @@ param.c: $S/conf/param.c
cp $S/conf/param.c .
param.o: param.c Makefile
- ${NORMAL_C_C}
+ ${NORMAL_C}
mcount.o: $S/lib/libkern/mcount.c Makefile
${NORMAL_C_NOP}