Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 20 Apr 2024 10:34:52 GMT
From:      Dimitry Andric <dim@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 7334d08a3ad4 - stable/13 - libcompiler_rt Makefile.inc: include bsd.compiler.mk to fix build
Message-ID:  <202404201034.43KAYq6u014502@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by dim:

URL: https://cgit.FreeBSD.org/src/commit/?id=7334d08a3ad434152c451a9dab6c8f7ddb8cf62e

commit 7334d08a3ad434152c451a9dab6c8f7ddb8cf62e
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:29:09 +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 a4d0203b8ed3..c0dacb5c9d7e 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/}
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404201034.43KAYq6u014502>