Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/tests/rump/rumpkern It seems that LDADD.file gets added to t...



details:   https://anonhg.NetBSD.org/src/rev/3653d13811b1
branches:  trunk
changeset: 749406:3653d13811b1
user:      he <he%NetBSD.org@localhost>
date:      Sat Nov 28 22:20:38 2009 +0000

description:
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.

diffstat:

 tests/rump/rumpkern/Makefile |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (21 lines):

diff -r e1649805d9af -r 3653d13811b1 tests/rump/rumpkern/Makefile
--- a/tests/rump/rumpkern/Makefile      Sat Nov 28 22:15:48 2009 +0000
+++ b/tests/rump/rumpkern/Makefile      Sat Nov 28 22:20:38 2009 +0000
@@ -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
 



Home | Main Index | Thread Index | Old Index