Author: mhorne
Date: Tue Jul 14 21:15:16 2020
New Revision: 363197
URL: https://svnweb.freebsd.org/changeset/base/363197
Log:
Really fix cleandir after r362973
I made an attempt to fix this in r362978, but all it really did was
confine the issue to the $MACHINE_CPUARCH == "riscv" case. The real
problem is that LINKER_FEATURES is not defined here, so bsd.linker.mk
needs to be included.
This error with cleandir only occurs when META_MODE is disabled, which
explains why it was missed by both CI and myself.
Note that this effectively reverts r362978.
Reported by: mjg
Reviewed by: imp, kevans (in IRC)
Modified:
head/stand/defs.mk
Modified: head/stand/defs.mk
==============================================================================
--- head/stand/defs.mk Tue Jul 14 21:14:59 2020 (r363196)
+++ head/stand/defs.mk Tue Jul 14 21:15:16 2020 (r363197)
@@ -17,6 +17,7 @@ INTERNALLIB=
.endif
.include <src.opts.mk>
+.include <bsd.linker.mk>
WARNS?= 1
@@ -151,7 +152,7 @@ CFLAGS+= -fPIC
# Some RISC-V linkers have support for relaxations, while some (lld) do not
# yet. If this is the case we inhibit the compiler from emitting relaxations.
-.if ${MACHINE_CPUARCH} == "riscv" && ${LINKER_FEATURES:Mriscv-relaxations} ==
""
+.if ${LINKER_FEATURES:Mriscv-relaxations} == ""
CFLAGS+= -mno-relax
.endif
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
