Module Name: src Committed By: pooka Date: Sun Mar 16 14:02:06 UTC 2014
Modified Files: src/sys/rump: Makefile.rump Log Message: Allow RUMP_LDSCRIPT itself to be used to specify which ldscript to use. HAVE_SUN_LD will be deprecated in the future. To generate a diff of this commit: cvs rdiff -u -r1.92 -r1.93 src/sys/rump/Makefile.rump Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/rump/Makefile.rump diff -u src/sys/rump/Makefile.rump:1.92 src/sys/rump/Makefile.rump:1.93 --- src/sys/rump/Makefile.rump:1.92 Sat Mar 15 15:15:26 2014 +++ src/sys/rump/Makefile.rump Sun Mar 16 14:02:06 2014 @@ -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}/../arch 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} -.else +.elif ${RUMP_LDSCRIPT} == "GNU" LDFLAGS+= -Wl,-T,${RUMPTOP}/ldscript.rump +.else +.error Unknown ldscript ${RUMP_LDSCRIPT} .endif .endif