Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 25 Dec 2021 11:55:41 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: c206fcf91165 - stable/12 - clang: Fix inverted condition in llvm.build.mk
Message-ID:  <202112251155.1BPBtfV6006635@gitrepo.freebsd.org>

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

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

commit c206fcf91165d4830c05cc2216045d4df011a463
Author:     Jessica Clarke <jrtc27@FreeBSD.org>
AuthorDate: 2021-08-12 22:53:30 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2021-12-25 11:51:15 +0000

    clang: Fix inverted condition in llvm.build.mk
    
    Fixes:          31ba4ce8898f ("Allow bootstrapping llvm-tblgen on macOS and Linux")
    MFC after:      1 week
    
    (cherry picked from commit 5ff5d1177bc66f1c2a0a6ee4d0ffa128d32e1dad)
---
 lib/clang/llvm.build.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/clang/llvm.build.mk b/lib/clang/llvm.build.mk
index 277cbd77de0b..dd1d5068efda 100644
--- a/lib/clang/llvm.build.mk
+++ b/lib/clang/llvm.build.mk
@@ -117,10 +117,10 @@ CXXSTD?=	c++14
 CXXFLAGS+=	-fno-exceptions
 CXXFLAGS+=	-fno-rtti
 .if ${.MAKE.OS} == "FreeBSD" || !defined(BOOTSTRAPPING)
+CXXFLAGS.clang+= -stdlib=libc++
+.else
 # Building on macOS/Linux needs the real sysctl() not the bootstrap tools stub.
 CFLAGS+=	-DBOOTSTRAPPING_WANT_NATIVE_SYSCTL
-.else
-CXXFLAGS.clang+= -stdlib=libc++
 .endif
 .if defined(BOOTSTRAPPING) && ${.MAKE.OS} == "Linux"
 LIBADD+=	dl



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