Module Name: src
Committed By: he
Date: Sat Nov 28 22:20:38 UTC 2009
Modified Files:
src/tests/rump/rumpkern: Makefile
Log Message:
It seems that LDADD.file gets added to the linker invocation after
the LDADD variable expansion. To support static linking, ensure
that the common libraries gets tacked on at the end as well (order
matters for static linking), by using a convenience variable and
add it to the end of LDADD.t_modlinkset, as well as when doing the
general LDADD+= setting.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/rump/rumpkern/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/rump/rumpkern/Makefile
diff -u src/tests/rump/rumpkern/Makefile:1.4 src/tests/rump/rumpkern/Makefile:1.5
--- src/tests/rump/rumpkern/Makefile:1.4 Fri Nov 6 15:26:54 2009
+++ src/tests/rump/rumpkern/Makefile Sat Nov 28 22:20:38 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/11/06 15:26:54 pooka Exp $
+# $NetBSD: Makefile,v 1.5 2009/11/28 22:20:38 he Exp $
.include <bsd.own.mk>
@@ -7,8 +7,9 @@
TESTS_C= t_modcmd
TESTS_C+= t_modlinkset
-LDADD.t_modlinkset+= -lukfs -lrumpfs_cd9660 -lrumpfs_msdos
-LDADD+= -lrumpvfs -lrump -lrumpuser -lpthread
+ADD_TO_LD= -lrumpvfs -lrump -lrumpuser -lpthread
+LDADD.t_modlinkset+= -lukfs -lrumpfs_cd9660 -lrumpfs_msdos ${ADD_TO_LD}
+LDADD+= ${ADD_TO_LD}
WARNS= 4
