Date: Wed, 15 Apr 2020 19:26:59 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r531783 - in head/devel/llvm90: . files/clang Message-ID: <202004151926.03FJQxtY057486@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Wed Apr 15 19:26:58 2020 New Revision: 531783 URL: https://svnweb.freebsd.org/changeset/ports/531783 Log: devel/llvm90: backport --target fix for libc++ Approved by: brooks (maintainer) Differential Revision: https://reviews.freebsd.org/D24420 Added: head/devel/llvm90/files/clang/patch-D77776 (contents, props changed) Modified: head/devel/llvm90/Makefile (contents, props changed) Modified: head/devel/llvm90/Makefile ============================================================================== --- head/devel/llvm90/Makefile Wed Apr 15 19:21:58 2020 (r531782) +++ head/devel/llvm90/Makefile Wed Apr 15 19:26:58 2020 (r531783) @@ -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} Added: head/devel/llvm90/files/clang/patch-D77776 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/llvm90/files/clang/patch-D77776 Wed Apr 15 19:26:58 2020 (r531783) @@ -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?202004151926.03FJQxtY057486>