diff --git a/Formula/llvm.rb b/Formula/llvm.rb index 30b38a19ed25c..42ea5ee9c3d08 100644 --- a/Formula/llvm.rb +++ b/Formula/llvm.rb @@ -1,7 +1,7 @@ class Llvm < Formula desc "Next-gen compiler infrastructure" homepage "https://llvm.org/" - revision 1 + revision 2 stable do url "https://releases.llvm.org/9.0.0/llvm-9.0.0.src.tar.xz" @@ -159,7 +159,7 @@ def install mkdir "build" do if MacOS.version >= :mojave - sdk_path = MacOS::CLT.installed? ? "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk" : MacOS.sdk_path + sdk_path = MacOS::CLT.installed? ? "/Library/Developer/CommandLineTools/SDKs/MacOSX#{MacOS.version}.sdk" : MacOS.sdk_path args << "-DDEFAULT_SYSROOT=#{sdk_path}" end @@ -169,6 +169,9 @@ def install system "make", "install-xcode-toolchain" end + # llvm-config requires a versioned dylib + lib.install_symlink lib/"libLLVM.dylib" => "libLLVM-#{version.to_s[/\d+/]}.dylib" + (share/"clang/tools").install Dir["tools/clang/tools/scan-{build,view}"] (share/"cmake").install "cmake/modules" inreplace "#{share}/clang/tools/scan-build/bin/scan-build", "$RealBin/bin/clang", "#{bin}/clang" @@ -247,7 +250,7 @@ def caveats; <<~EOS # Testing Command Line Tools if MacOS::CLT.installed? toolchain_path = "/Library/Developer/CommandLineTools" - sdk_path = "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk" + sdk_path = "/Library/Developer/CommandLineTools/SDKs/MacOSX#{MacOS.version}.sdk" system "#{bin}/clang++", "-v", "-isysroot", sdk_path, "-isystem", "#{toolchain_path}/usr/include/c++/v1", diff --git a/Formula/llvm@6.rb b/Formula/llvm@6.rb index 4525272a97339..2f72261dabcde 100644 --- a/Formula/llvm@6.rb +++ b/Formula/llvm@6.rb @@ -3,7 +3,7 @@ class LlvmAT6 < Formula homepage "https://llvm.org/" url "https://releases.llvm.org/6.0.1/llvm-6.0.1.src.tar.xz" sha256 "b6d6c324f9c71494c0ccaf3dac1f16236d970002b42bb24a6c9e1634f7d0f4e2" - revision 2 + revision 3 bottle do cellar :any @@ -109,7 +109,7 @@ def install ] if MacOS.version >= :mojave - sdk_path = MacOS::CLT.installed? ? "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk" : MacOS.sdk_path + sdk_path = MacOS::CLT.installed? ? "/Library/Developer/CommandLineTools/SDKs/MacOSX#{MacOS.version}.sdk" : MacOS.sdk_path args << "-DDEFAULT_SYSROOT=#{sdk_path}" end @@ -120,6 +120,9 @@ def install system "make", "install-xcode-toolchain" end + # llvm-config requires a versioned dylib + lib.install_symlink lib/"libLLVM.dylib" => "libLLVM-6.0.dylib" + (share/"cmake").install "cmake/modules" (share/"clang/tools").install Dir["tools/clang/tools/scan-{build,view}"] @@ -205,7 +208,7 @@ def caveats; <<~EOS # Testing Command Line Tools if MacOS::CLT.installed? toolchain_path = "/Library/Developer/CommandLineTools" - sdk_path = "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk" + sdk_path = "/Library/Developer/CommandLineTools/SDKs/MacOSX#{MacOS.version}.sdk" system "#{bin}/clang++", "-v", "-isysroot", sdk_path, "-isystem", "#{toolchain_path}/usr/include/c++/v1", diff --git a/Formula/llvm@7.rb b/Formula/llvm@7.rb index 071427191fcd9..ef1e57304a97c 100644 --- a/Formula/llvm@7.rb +++ b/Formula/llvm@7.rb @@ -3,7 +3,7 @@ class LlvmAT7 < Formula homepage "https://llvm.org/" url "https://releases.llvm.org/7.1.0/llvm-7.1.0.src.tar.xz" sha256 "1bcc9b285074ded87b88faaedddb88e6b5d6c331dfcfb57d7f3393dd622b3764" - revision 1 + revision 2 bottle do cellar :any @@ -105,7 +105,7 @@ def install ] if MacOS.version >= :mojave - sdk_path = MacOS::CLT.installed? ? "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk" : MacOS.sdk_path + sdk_path = MacOS::CLT.installed? ? "/Library/Developer/CommandLineTools/SDKs/MacOSX#{MacOS.version}.sdk" : MacOS.sdk_path args << "-DDEFAULT_SYSROOT=#{sdk_path}" end @@ -116,6 +116,9 @@ def install system "make", "install-xcode-toolchain" end + # llvm-config requires a versioned dylib + lib.install_symlink lib/"libLLVM.dylib" => "libLLVM-#{version.to_s[/\d+/]}.dylib" + (share/"cmake").install "cmake/modules" (share/"clang/tools").install Dir["tools/clang/tools/scan-{build,view}"] @@ -198,7 +201,7 @@ def caveats; <<~EOS # Testing Command Line Tools if MacOS::CLT.installed? toolchain_path = "/Library/Developer/CommandLineTools" - sdk_path = "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk" + sdk_path = "/Library/Developer/CommandLineTools/SDKs/MacOSX#{MacOS.version}.sdk" system "#{bin}/clang++", "-v", "-isysroot", sdk_path, "-isystem", "#{toolchain_path}/usr/include/c++/v1", diff --git a/Formula/llvm@8.rb b/Formula/llvm@8.rb index b4742f4435751..89d8a5081c776 100644 --- a/Formula/llvm@8.rb +++ b/Formula/llvm@8.rb @@ -3,7 +3,7 @@ class LlvmAT8 < Formula homepage "https://llvm.org/" url "https://github.com/llvm/llvm-project/releases/download/llvmorg-8.0.1/llvm-8.0.1.src.tar.xz" sha256 "44787a6d02f7140f145e2250d56c9f849334e11f9ae379827510ed72f12b75e7" - revision 1 + revision 2 bottle do cellar :any @@ -115,7 +115,7 @@ def install ] if MacOS.version >= :mojave - sdk_path = MacOS::CLT.installed? ? "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk" : MacOS.sdk_path + sdk_path = MacOS::CLT.installed? ? "/Library/Developer/CommandLineTools/SDKs/MacOSX#{MacOS.version}.sdk" : MacOS.sdk_path args << "-DDEFAULT_SYSROOT=#{sdk_path}" end @@ -126,6 +126,9 @@ def install system "make", "install-xcode-toolchain" end + # llvm-config requires a versioned dylib + lib.install_symlink lib/"libLLVM.dylib" => "libLLVM-#{version.to_s[/\d+/]}.dylib" + (share/"clang/tools").install Dir["tools/clang/tools/scan-{build,view}"] (share/"cmake").install "cmake/modules" inreplace "#{share}/clang/tools/scan-build/bin/scan-build", "$RealBin/bin/clang", "#{bin}/clang" @@ -204,7 +207,7 @@ def caveats; <<~EOS # Testing Command Line Tools if MacOS::CLT.installed? toolchain_path = "/Library/Developer/CommandLineTools" - sdk_path = "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk" + sdk_path = "/Library/Developer/CommandLineTools/SDKs/MacOSX#{MacOS.version}.sdk" system "#{bin}/clang++", "-v", "-isysroot", sdk_path, "-isystem", "#{toolchain_path}/usr/include/c++/v1",