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

Bootstrap crunchgen after removing -dc from linker invocation

Browse Source 
In ec81497cc7 crunchgen was updated to remove -dc from the linker
invocations in its generated makefile output, as this flag is no longer
necessary, and is going to be an error with lld 15.

Update the BOOTSTRAPPING conditions for copying the crunchgen binary
from the host, or actually bootstrapping it when necessary. Since
ec81497cc7 did not bump __FreeBSD_version, I have chosen the nearest
values.

Fixes:		ec81497cc7
MFC after:	3 days
This commit is contained in:
Dimitry Andric 2022-07-14 23:13:41 +02:00
parent 90bcc81bc3
commit 93f5ab129a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.inc1
View File

@ -2307,9 +2307,10 @@ _crunchide= usr.sbin/crunch/crunchide
_bootstrap_tools_links+=crunchide
.endif
# 1300115: Higher WARNS fixes
.if ${BOOTSTRAPPING} < 1202502 || \
(${BOOTSTRAPPING} > 1300000 && ${BOOTSTRAPPING} < 1300131)
# 1400052, 1300526, 1203507: Removed -dc from linker invocation
.if ${BOOTSTRAPPING} < 1203507 || \
(${BOOTSTRAPPING} > 1300000 && ${BOOTSTRAPPING} < 1300526) || \
(${BOOTSTRAPPING} > 1400000 && ${BOOTSTRAPPING} < 1400052)
_crunchgen= usr.sbin/crunch/crunchgen
.else
_bootstrap_tools_links+=crunchgen