[src/trunk]: src/sys/rump Allow RUMP_LDSCRIPT itself to be used to specify wh...

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/584025997c7c
branches:  trunk
changeset: 327769:584025997c7c
user:      pooka <pooka%NetBSD.org@localhost>
date:      Sun Mar 16 14:02:06 2014 +0000

description:
Allow RUMP_LDSCRIPT itself to be used to specify which ldscript to use.
HAVE_SUN_LD will be deprecated in the future.

diffstat:

 sys/rump/Makefile.rump |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (30 lines):

diff -r 70a0b079f100 -r 584025997c7c sys/rump/Makefile.rump
--- a/sys/rump/Makefile.rump    Sun Mar 16 13:37:36 2014 +0000
+++ b/sys/rump/Makefile.rump    Sun Mar 16 14:02:06 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.rump,v 1.92 2014/03/15 15:15:26 pooka Exp $
+#      $NetBSD: Makefile.rump,v 1.93 2014/03/16 14:02:06 pooka Exp $
 #
 
 WARNS?=                3       # XXX: src/sys won't compile with -Wsign-compare yet
@@ -39,15 +39,17 @@
 CPPFLAGS+=     -I${RUMPTOP}/..
 .endif
 
-RUMP_LDSCRIPT?=yes
+RUMP_LDSCRIPT?=        GNU
 .if ${RUMP_LDSCRIPT} != "no"
 # my ld or yours?
-.ifdef HAVE_SUN_LD
+.if ${RUMP_LDSCRIPT} == "sun" || defined(HAVE_SUN_LD)
 LDFLAGS+=      -Wl,-M ${RUMPTOP}/ldscript_sun.rump
 SRCS+=         linksyms_sun.c
 .PATH:         ${RUMPTOP}
+.elif ${RUMP_LDSCRIPT} == "GNU"
+LDFLAGS+=      -Wl,-T,${RUMPTOP}/ldscript.rump
 .else
-LDFLAGS+=      -Wl,-T,${RUMPTOP}/ldscript.rump
+.error Unknown ldscript ${RUMP_LDSCRIPT}
 .endif
 .endif