Re: Fix for kern/51772 breaks linking multi-config kernels?

[Yorick Hardy <yorickhardy%gmail.com@localhost>]

On 2017-01-04, Yorick Hardy wrote:
> On 2017-01-04, Yorick Hardy wrote:
> > Dear Martin,
> > 
> > On 2017-01-04, Martin Husemann wrote:
> > > On Wed, Jan 04, 2017 at 07:28:19PM +0200, Yorick Hardy wrote:
> > > > Apologies, my "fix" broke your build. I wonder why it worked before,
> > > > probably becuase you have "netbsd" as part of your kernel name?
> > > > 
> > > > Maybe the change should be reverted until the correct solution is found.
> > > 
> > > Just a side note: we have several evb* configs that use multiple config
> > > statements, for example sys/arch/evbmips/conf/ZYXELKX:
> > > 
> > > config          netbsd root on ? type ?
> > > config          netbsd-sd0a root on sd0a type ffs dumps none
> > > config          netbsd-reth0 root on reth0 type nfs dumps none
> > > 
> > > 
> > > Martin
> > 
> > I am to blame for testing only a very simple configuration!
> > 
> > But it still seems wrong...
> > 
> > Is it correct that ${SYSTEM_OBJ:N*swap*netbsd*} is only for
> > configurations named "netbsd*" - are other names allowed?
> > 
> > Maybe we should just use ${SYSTEM_OBJ:N*swap*}, but I still
> > need to check whether any other object files match this pattern.
> 
> The suggested pattern will not work.
> 
> Perhaps I am the only person with a kernel not named "netbsd*"!
> I suggest reverting the change until we find a solution, with my
> apologies.

I am testing the patch below, it worked for my kernel which is not named
"netbsd*"; I am now testing ZYXELKX. My machine is not the fastest, so it
will take a while.

Are there any other possible object files beginning with swap* ?

-- 
Kind regards,

Yorick Hardy

Index: sys/conf/Makefile.kern.inc
===================================================================
RCS file: /cvsroot/src/sys/conf/Makefile.kern.inc,v
retrieving revision 1.251
diff -u -r1.251 Makefile.kern.inc
--- sys/conf/Makefile.kern.inc	4 Jan 2017 15:43:04 -0000	1.251
+++ sys/conf/Makefile.kern.inc	4 Jan 2017 18:12:27 -0000
@@ -213,10 +213,10 @@
 SYSTEM_LD?=	${_MKSHMSG} "   link  ${.CURDIR:T}/${.TARGET}"; \
 		${_MKSHECHO}\
 		${LD} -Map ${.TARGET}.map --cref ${LINKFLAGS} -o ${.TARGET} \
-		'$${SYSTEM_OBJ:N*swap*${.TARGET}*}' '$${EXTRA_OBJ}' vers.o \
+		'$${SYSTEM_OBJ:Nswap*}' '$${EXTRA_OBJ}' vers.o \
 		${OBJS:M*swap${.TARGET}.o}; \
 		${LD} -Map ${.TARGET}.map --cref ${LINKFLAGS} -o ${.TARGET} \
-		${SYSTEM_OBJ:N*swap*${.TARGET}*} ${EXTRA_OBJ} vers.o \
+		${SYSTEM_OBJ:Nswap*} ${EXTRA_OBJ} vers.o \
 		${OBJS:M*swap${.TARGET}.o}
 
 TEXTADDR?=	${LOADADDRESS}			# backwards compatibility