diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-11-25 11:23:34 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-11-25 11:23:34 +0000 |
| commit | 81c82f0a9fedfa5bda0780e86db5a95a644b83dc (patch) | |
| tree | 96e86ecc2edffc7e5499f96782d7c6f3fe3018ce /sys/arch/amd64/conf | |
| parent | 7ac5456ddfe594fa299bc0055230df33e759a988 (diff) | |
Get rid of the kernel 'libcompat' framework, and instead use conf/files to
decide which files must be pulled into the kernel. Also conditionalize
the pulling of those files based on the COMPAT_* options.
Diffstat (limited to 'sys/arch/amd64/conf')
| -rw-r--r-- | sys/arch/amd64/conf/Makefile.amd64 | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/sys/arch/amd64/conf/Makefile.amd64 b/sys/arch/amd64/conf/Makefile.amd64 index 489acf807cb..fc428942bb0 100644 --- a/sys/arch/amd64/conf/Makefile.amd64 +++ b/sys/arch/amd64/conf/Makefile.amd64 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.amd64,v 1.12 2007/10/29 22:29:13 espie Exp $ +# $OpenBSD: Makefile.amd64,v 1.13 2007/11/25 11:23:33 deraadt Exp $ # Makefile for OpenBSD # @@ -64,14 +64,6 @@ LIBKERN= ${KERNLIB} LIBKERN= ${KERNLIB_PROF} .endif -### find out what to use for libcompat -.include "$S/compat/common/Makefile.inc" -.ifndef PROF -LIBCOMPAT= ${COMPATLIB} -.else -LIBCOMPAT= ${COMPATLIB_PROF} -.endif - # compile rules: rules are named ${TYPE}_${SUFFIX}${CONFIG_DEP} # where TYPE is NORMAL, DRIVER, or PROFILE; SUFFIX is the file suffix, # capitalized (e.g. C for a .c file), and CONFIG_DEP is _C if the file @@ -99,8 +91,7 @@ HOSTED_C= ${HOSTCC} ${HOSTED_CFLAGS} ${HOSTED_CPPFLAGS} -c $< # ${SYSTEM_LD_HEAD} # ${SYSTEM_LD} swapxxx.o # ${SYSTEM_LD_TAIL} -SYSTEM_OBJ= locore.o vector.o copy.o spl.o \ - param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT} +SYSTEM_OBJ= locore.o vector.o copy.o spl.o param.o ioconf.o ${OBJS} ${LIBKERN} SYSTEM_DEP= Makefile ${SYSTEM_OBJ} SYSTEM_LD_HEAD= rm -f $@ SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \ |