d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kern.mk: Fix wrong variable being used for linker path after 172a624f0

Browse Source 
When I synchronized kern.mk with bsd.sys.mk, I accidentally changed
CCLDFLAGS to LDFLAGS which is not used by the kernel builds. This commit
should unbreak the GitHub actions cross-build CI. I didn't notice it
locally because cheribuild already passes -fuse-ld in the linker flags as
it predates this being done in the makefiles.

Reported By:	Jose Luis Duran
Fixes:		172a624f0 ("Silence annoying and incorrect non-default linker warning with GCC")
This commit is contained in:
Alex Richardson 2021-03-08 09:37:39 +00:00
parent e0fd837a30
commit 01fe4cac28
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/conf/kern.mk
View File

@ -283,9 +283,9 @@ CFLAGS+= -std=${CSTD}
.if ${COMPILER_TYPE} == "clang"
# Note: Clang does not like relative paths for ld so we map ld.lld -> lld.
.if ${COMPILER_VERSION} >= 120000
LDFLAGS+= --ld-path=${LD:[1]:S/^ld.//1W}
CCLDFLAGS+= --ld-path=${LD:[1]:S/^ld.//1W}
.else
LDFLAGS+= -fuse-ld=${LD:[1]:S/^ld.//1W}
CCLDFLAGS+= -fuse-ld=${LD:[1]:S/^ld.//1W}
.endif
.else
# GCC does not support an absolute path for -fuse-ld so we just print this