summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2010-05-23 16:56:07 +0000
committerderaadt <deraadt@openbsd.org>2010-05-23 16:56:07 +0000
commit19939b03a75e8dd0899b13804a871b2a485f9c52 (patch)
tree5f75e90f0fce3f6e1ac5b93f56a1c56aa3e59681
parentDoes not need -Dlandisk, and instead, but -Dlandisk is nice since that is (diff)
downloadwireguard-openbsd-19939b03a75e8dd0899b13804a871b2a485f9c52.tar.xz
wireguard-openbsd-19939b03a75e8dd0899b13804a871b2a485f9c52.zip
Does not need -Dloongson, and instead, but -D__loongson__ is nice since that is
the mach (arch is mips64). Also move towards passing $PARAM around in CPPFLAGS, instead of compiling param.c in a special way, as discussed with miod
-rw-r--r--sys/arch/loongson/conf/Makefile.loongson8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/loongson/conf/Makefile.loongson b/sys/arch/loongson/conf/Makefile.loongson
index 93f6341c264..d980b9b3a37 100644
--- a/sys/arch/loongson/conf/Makefile.loongson
+++ b/sys/arch/loongson/conf/Makefile.loongson
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.loongson,v 1.17 2010/04/28 15:31:33 deraadt Exp $
+# $OpenBSD: Makefile.loongson,v 1.18 2010/05/23 16:56:07 deraadt Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -35,7 +35,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}__
CDIAGFLAGS= -Werror -Wall -Wmissing-prototypes -Wstrict-prototypes \
-Wno-uninitialized -Wno-format -Wno-main \
-Wstack-larger-than-2047 -Wvariable-decl
@@ -59,7 +59,7 @@ DB_STRUCTINFO=
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 $@
@@ -135,7 +135,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}