wbrawner/homebrew-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

llvm: remove libcxxabi option. (#4170)

Browse source 
It's pretty broken (as noted in their own README and our comment) and
causes failures with other formulae.

Fixes #4081.
This commit is contained in:
Mike McQuaid 2016-08-24 14:41:13 +01:00 committed by GitHub
parent bb8f040953
commit 2e1576eb07
1 changed files with 1 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Formula/llvm.rb
View file

@ -47,11 +47,6 @@ class Llvm < Formula
sha256 "77d7f3784c88096d785bd705fa1bab7031ce184cd91ba8a7008abf55264eeecc"
end
resource "libcxxabi" do
url "http://llvm.org/releases/3.8.1/libcxxabi-3.8.1.src.tar.xz"
sha256 "e1b55f7be3fad746bdd3025f43e42d429fb6194aac5919c2be17c4a06314dae1"
end
resource "libunwind" do
url "http://llvm.org/releases/3.8.1/libunwind-3.8.1.src.tar.xz"
sha256 "21e58ce09a5982255ecf86b86359179ddb0be4f8f284a95be14201df90e48453"
@ -103,10 +98,6 @@ class Llvm < Formula
url "http://llvm.org/git/libcxx.git"
end
resource "libcxxabi" do
url "http://llvm.org/git/libcxxabi.git"
end
resource "libunwind" do
url "http://llvm.org/git/libunwind.git"
end
@ -133,11 +124,7 @@ class Llvm < Formula
option :universal
option "without-compiler-rt", "Do not build Clang runtime support libraries for code sanitizers, builtins, and profiling"
option "without-libcxx", "Do not build libc++ standard library"
option "with-libcxxabi", "Build libc++abi standard library"
option "with-toolchain", "Build with Toolchain to facilitate overriding system compiler"
# From TODO.TXT file in libcxxabi: CMake always link to /usr/lib/libc++abi.dylib on OS X.
# Building libcxxabi results in an additional @rpath in libc++.1.0.dylib that Homebrew can not "fix".
# As a result, library does not work when invoked as usual.
option "without-libunwind", "Do not build libunwind library"
option "without-lld", "Do not build LLD linker"
option "with-lldb", "Build LLDB debugger"
@ -187,11 +174,9 @@ class Llvm < Formula
(buildpath/"tools/clang/tools/extra").install resource("clang-extra-tools")
(buildpath/"projects/openmp").install resource("openmp")
(buildpath/"projects/libcxx").install resource("libcxx") if build_libcxx?
(buildpath/"projects/libunwind").install resource("libunwind") if build.with? "libunwind"
(buildpath/"tools/lld").install resource("lld") if build.with? "lld"
(buildpath/"tools/polly").install resource("polly") if build.with? "polly"
["libcxxabi", "libunwind"].each do |r|
(buildpath/"projects"/r).install resource(r) if build.with? r
end
if build.with? "lldb"
if build.with? "python"
@ -247,7 +232,6 @@ class Llvm < Formula
args << "-DLLVM_ENABLE_RTTI=ON" if build.with? "rtti"
args << "-DLLVM_INSTALL_UTILS=ON" if build.with? "utils"
args << "-DLLVM_ENABLE_LIBCXX=ON" if build_libcxx?
args << "-DLLVM_ENABLE_LIBCXXABI=ON" if build.with? "libcxxabi"
if build.with?("lldb") && build.with?("python")
args << "-DLLDB_RELOCATABLE_PYTHON=ON"
@ -271,10 +255,6 @@ class Llvm < Formula
args << "-DLINK_POLLY_INTO_TOOLS=ON"
end
if build.with?("libunwind") && build.with?("libcxxabi")
args << "-DLIBCXXABI_USE_LLVM_UNWINDER=ON"
end
mktemp do
system "cmake", "-G", "Unix Makefiles", buildpath, *(std_cmake_args + args)
system "make"