Author: bdrewery
Date: Wed Jul 5 19:43:16 2017
New Revision: 320695
URL: https://svnweb.freebsd.org/changeset/base/320695
Log:
Fix out-of-tree kernel builds after r320275 when bsd.linker.mk not yet
installed.
Submitted by: bde
Modified:
head/sys/conf/kern.pre.mk
head/sys/conf/kmod.mk
Modified: head/sys/conf/kern.pre.mk
==============================================================================
--- head/sys/conf/kern.pre.mk Wed Jul 5 19:25:09 2017 (r320694)
+++ head/sys/conf/kern.pre.mk Wed Jul 5 19:43:16 2017 (r320695)
@@ -114,7 +114,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: head/sys/conf/kmod.mk
==============================================================================
--- head/sys/conf/kmod.mk Wed Jul 5 19:25:09 2017 (r320694)
+++ head/sys/conf/kmod.mk Wed Jul 5 19:43:16 2017 (r320695)
@@ -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
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
