git: 89ef2b34ab73 - stable/14 - libcompiler_rt Makefile.inc: include bsd.compiler.mk to fix build
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 20 Apr 2024 10:32:45 UTC
The branch stable/14 has been updated by dim:
URL: https://cgit.FreeBSD.org/src/commit/?id=89ef2b34ab7333699641b7f8763633a51ee166a0
commit 89ef2b34ab7333699641b7f8763633a51ee166a0
Author: Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2024-04-07 19:45:51 +0000
Commit: Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2024-04-20 10:03:25 +0000
libcompiler_rt Makefile.inc: include bsd.compiler.mk to fix build
Apparently libgcc_s has always included libcompiler_rt's Makefile.inc
without first including bsd.compiler.mk, even though Makefile.inc used
COMPILER_TYPE already. It looks like we were just lucky that the
expression was not malformed.
PR: 276104
Reported by: Herbert J. Skuhra <herbert@gojira.at>
MFC after: 1 month
(cherry picked from commit 4c983a2886877a855ac3a2836b15d80356fbb8d4)
---
lib/libcompiler_rt/Makefile.inc | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/libcompiler_rt/Makefile.inc b/lib/libcompiler_rt/Makefile.inc
index 2c756f4ad21f..47d87b71ea77 100644
--- a/lib/libcompiler_rt/Makefile.inc
+++ b/lib/libcompiler_rt/Makefile.inc
@@ -1,3 +1,4 @@
+.include <bsd.compiler.mk>
CRTARCH= ${MACHINE_CPUARCH:C/amd64/x86_64/:C/powerpc/ppc/}