Date: Fri, 17 Apr 2020 16:02:48 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r531945 - in branches/2020Q2/devel/llvm90: . files/clang Message-ID: <202004171602.03HG2mkT040842@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Fri Apr 17 16:02:48 2020 New Revision: 531945 URL: https://svnweb.freebsd.org/changeset/ports/531945 Log: MFH: r531783 devel/llvm90: backport --target fix for libc++ Approved by: brooks (maintainer) Approved by: ports-secteam blanket (required by Firefox 76) Differential Revision: https://reviews.freebsd.org/D24420 Added: branches/2020Q2/devel/llvm90/files/clang/patch-D77776 - copied unchanged from r531783, head/devel/llvm90/files/clang/patch-D77776 Modified: branches/2020Q2/devel/llvm90/Makefile Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/devel/llvm90/Makefile ============================================================================== --- branches/2020Q2/devel/llvm90/Makefile Fri Apr 17 15:27:08 2020 (r531944) +++ branches/2020Q2/devel/llvm90/Makefile Fri Apr 17 16:02:48 2020 (r531945) @@ -2,7 +2,7 @@ PORTNAME= llvm DISTVERSION= 9.0.1 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= devel lang MASTER_SITES= https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION}/ PKGNAMESUFFIX= ${LLVM_SUFFIX} Copied: branches/2020Q2/devel/llvm90/files/clang/patch-D77776 (from r531783, head/devel/llvm90/files/clang/patch-D77776) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q2/devel/llvm90/files/clang/patch-D77776 Fri Apr 17 16:02:48 2020 (r531945, copy of r531783, head/devel/llvm90/files/clang/patch-D77776) @@ -0,0 +1,20 @@ +[Driver] Default to libc++ on FreeBSD + +Downstream may naively translate between DSL and LLVM target +triple. If OS version is lost in the process then Clang would +default to a version that's no longer supported by OS vendor. + +https://reviews.llvm.org/D77776 + +--- tools/clang/lib/Driver/ToolChains/FreeBSD.cpp.orig 2019-12-11 19:15:30 UTC ++++ tools/clang/lib/Driver/ToolChains/FreeBSD.cpp +@@ -351,7 +351,8 @@ FreeBSD::FreeBSD(const Driver &D, const llvm::Triple & + } + + ToolChain::CXXStdlibType FreeBSD::GetDefaultCXXStdlibType() const { +- if (getTriple().getOSMajorVersion() >= 10) ++ unsigned Major = getTriple().getOSMajorVersion(); ++ if (Major >= 10 || Major == 0) + return ToolChain::CST_Libcxx; + return ToolChain::CST_Libstdcxx; + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004171602.03HG2mkT040842>