From f6ee2913053fae980acb28ff2a09726dcfc90ff0 Mon Sep 17 00:00:00 2001 From: Yaroslav Tykhiy Date: Fri, 10 Feb 2006 00:38:08 +0000 Subject: MFC: Avoid creating (and subsequently using) fake opt_*.h files when the modules are built with the kernel and hence actual opt_*.h files are available in ${KERNBUILDDIR}. Fix a few small bugs that would prevent this from working. At last the build options of the modules become consistent with those of the kernel unless the MODULES_WITH_WORLD way still is used. Approved by: re (kensmith, scottl) Requested by: ru Tested on: amd64 i386 sparc64 Tested by: md5 --- sys/modules/linux/Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'sys/modules/linux') diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile index e446790c0a27..213fa4d5e80c 100644 --- a/sys/modules/linux/Makefile +++ b/sys/modules/linux/Makefile @@ -37,10 +37,12 @@ linux_locore.o: linux_locore.s linux_assym.h linux_genassym.o: linux_genassym.c linux.h @ machine ${CC} -c ${CFLAGS:N-fno-common} ${.IMPSRC} +.if !defined(KERNBUILDDIR) opt_compat.h: echo "#define COMPAT_43 1" > opt_compat.h opt_inet6.h: echo "#define INET6 1" > opt_inet6.h +.endif .include -- cgit v1.3