Fri Jan 2 14:03:15 2009 UTC ()
Add kludge to allow amd64 compat to build.  This is not a proper
fix which most likely requires some compat lib build infra toggle.


(pooka)
diff -r1.29 -r1.30 src/sys/rump/librump/rumpkern/Makefile.rumpkern
cvs diff -r1.29 -r1.30 src/sys/rump/librump/rumpkern/Makefile.rumpkern (expand / switch to unified diff)

--- src/sys/rump/librump/rumpkern/Makefile.rumpkern 2009/01/02 02:54:13 1.29
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern 2009/01/02 14:03:15 1.30
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.rumpkern,v 1.29 2009/01/02 02:54:13 pooka Exp $ 1# $NetBSD: Makefile.rumpkern,v 1.30 2009/01/02 14:03:15 pooka Exp $
2# 2#
3 3
4.include "${RUMPTOP}/Makefile.rump" 4.include "${RUMPTOP}/Makefile.rump"
5 5
6LIB= rump 6LIB= rump
7LDFLAGS+= -Wl,--wrap=malloc 7LDFLAGS+= -Wl,--wrap=malloc
8 8
9.PATH: ${RUMPTOP}/librump/rumpkern \ 9.PATH: ${RUMPTOP}/librump/rumpkern \
10 ${RUMPTOP}/../kern ${RUMPTOP}/../lib/libkern \ 10 ${RUMPTOP}/../kern ${RUMPTOP}/../lib/libkern \
11 ${RUMPTOP}/../conf ${RUMPTOP}/../dev \ 11 ${RUMPTOP}/../conf ${RUMPTOP}/../dev \
12 ${RUMPTOP}/../../common/lib/libutil \ 12 ${RUMPTOP}/../../common/lib/libutil \
13 ${RUMPTOP}/../../common/lib/libutil \ 13 ${RUMPTOP}/../../common/lib/libutil \
14 ${RUMPTOP}/../../common/lib/libc/gen \ 14 ${RUMPTOP}/../../common/lib/libc/gen \
@@ -68,23 +68,31 @@ SRCS+= blkset.S @@ -68,23 +68,31 @@ SRCS+= blkset.S
68SHLIB_MAJOR= 0 68SHLIB_MAJOR= 0
69SHLIB_MINOR= 0 69SHLIB_MINOR= 0
70 70
71CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern 71CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern
72CPPFLAGS+= -I${RUMPTOP}/librump/rumpnet -I${RUMPTOP}/librump/rumpvfs 72CPPFLAGS+= -I${RUMPTOP}/librump/rumpnet -I${RUMPTOP}/librump/rumpvfs
73CFLAGS+= -Wno-pointer-sign 73CFLAGS+= -Wno-pointer-sign
74 74
75# 75#
76# If archdir exists, it is required to provide: 76# If archdir exists, it is required to provide:
77# 1) kobj_reloc() and kobj_machdep() 77# 1) kobj_reloc() and kobj_machdep()
78# 2) ...? 78# 2) ...?
79# 3) PROFIT! 79# 3) PROFIT!
80# 80#
 81
 82#
 83# XXX: THIS IS UGLY, NEEDS BETTER FIX FOR COMPAT LIB
 84#
 85.ifdef(LD32DIR)
 86ARCHDIR= ${RUMPTOP}/librump/rumpkern/arch/${LD32DIR}
 87.else
81ARCHDIR= ${RUMPTOP}/librump/rumpkern/arch/${MACHINE_ARCH} 88ARCHDIR= ${RUMPTOP}/librump/rumpkern/arch/${MACHINE_ARCH}
 89.endif
82.if exists(${ARCHDIR}) 90.if exists(${ARCHDIR})
83.include "${ARCHDIR}/Makefile.inc" 91.include "${ARCHDIR}/Makefile.inc"
84.PATH: ${ARCHDIR} 92.PATH: ${ARCHDIR}
85.else 93.else
86SRCS+= kobj_stubs.c 94SRCS+= kobj_stubs.c
87.endif 95.endif
88 96
89.include <bsd.lib.mk> 97.include <bsd.lib.mk>
90.include <bsd.klinks.mk> 98.include <bsd.klinks.mk>