svn commit: r331752 - stable/11/sys/conf

[Ed Maste]

Author: emaste
Date: Fri Mar 30 01:22:47 2018
New Revision: 331752
URL: https://svnweb.freebsd.org/changeset/base/331752

Log:
  MFC r320695 (bdrewery): Fix out-of-tree kernel builds
  
  after r331730 (MFC of r320275) when bsd.linker.mk not yet installed.

Modified:
  stable/11/sys/conf/kern.pre.mk
  stable/11/sys/conf/kmod.mk
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/conf/kern.pre.mk
==============================================================================
--- stable/11/sys/conf/kern.pre.mk	Fri Mar 30 01:19:53 2018	(r331751)
+++ stable/11/sys/conf/kern.pre.mk	Fri Mar 30 01:22:47 2018	(r331752)
@@ -109,7 +109,7 @@ DEFINED_PROF=	${PROF}
 # can override the others.
 CFLAGS+=	${CONF_CFLAGS}
 
-.if ${LINKER_FEATURES:Mbuild-id}
+.if defined(LINKER_FEATURES) && ${LINKER_FEATURES:Mbuild-id}
 LDFLAGS+=	-Wl,--build-id=sha1
 .endif
 

Modified: stable/11/sys/conf/kmod.mk
==============================================================================
--- stable/11/sys/conf/kmod.mk	Fri Mar 30 01:19:53 2018	(r331751)
+++ stable/11/sys/conf/kmod.mk	Fri Mar 30 01:22:47 2018	(r331752)
@@ -125,7 +125,7 @@ CFLAGS.gcc+= --param large-function-growth=1000
 CFLAGS+=	-fno-common
 LDFLAGS+=	-d -warn-common
 
-.if ${LINKER_FEATURES:Mbuild-id}
+.if defined(LINKER_FEATURES) && ${LINKER_FEATURES:Mbuild-id}
 LDFLAGS+=	-Wl,--build-id=sha1
 .endif