git: 93f5ab129a3d - main - Bootstrap crunchgen after removing -dc from linker invocation
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 14 Jul 2022 21:14:30 UTC
The branch main has been updated by dim:
URL: https://cgit.FreeBSD.org/src/commit/?id=93f5ab129a3d46f4f434a13306fc99f476456c00
commit 93f5ab129a3d46f4f434a13306fc99f476456c00
Author: Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2022-07-14 21:13:41 +0000
Commit: Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2022-07-14 21:14:18 +0000
Bootstrap crunchgen after removing -dc from linker invocation
In ec81497cc726 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
ec81497cc726 did not bump __FreeBSD_version, I have chosen the nearest
values.
Fixes: ec81497cc726
MFC after: 3 days
---
Makefile.inc1 | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/Makefile.inc1 b/Makefile.inc1
index 1b3471bb1433..73bbba7fef54 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -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