@@ -34,13 +34,11 @@ def setup_llvm_toolchain(name):
3434 # On Linux, use the bundled libc++ (builtin-libc++) for hermetic builds.
3535 stdlib = {
3636 "darwin-aarch64" : "libc++" ,
37- "darwin-x86_64" : "libc++" ,
3837 "" : "builtin-libc++" , # Default for all other platforms
3938 },
4039 # Point to macOS SDK for system headers and frameworks
4140 sysroot = {
4241 "darwin-aarch64" : _MACOS_SDK ,
43- "darwin-x86_64" : _MACOS_SDK ,
4442 },
4543 # Add extra cxx_flags to use macOS SDK libc++ headers instead of LLVM's bundled ones.
4644 # -nostdinc++ disables the default C++ header search paths (including LLVM's bundled headers)
@@ -52,41 +50,31 @@ def setup_llvm_toolchain(name):
5250 "-isystem" ,
5351 _MACOS_SDK + "/usr/include/c++/v1" ,
5452 ],
55- "darwin-x86_64" : [
56- "-nostdinc++" ,
57- "-isystem" ,
58- _MACOS_SDK + "/usr/include/c++/v1" ,
59- ],
6053 },
6154 # Override link_libs for darwin platforms to use dynamic libc++ instead
6255 # of the default static -l:libc++.a which doesn't exist on macOS.
6356 # We explicitly link -lc++ and -lc++abi dynamically.
6457 link_libs = {
6558 "darwin-aarch64" : ["-lc++" , "-lc++abi" ],
66- "darwin-x86_64" : ["-lc++" , "-lc++abi" ],
6759 },
6860 llvm_versions = {
6961 "linux-aarch64" : "21.1.8" ,
7062 "linux-x86_64" : "21.1.8" ,
7163 "darwin-aarch64" : "21.1.8" ,
72- "darwin-x86_64" : "21.1.8" ,
7364 },
7465 sha256 = {
7566 "linux-aarch64" : "65ce0b329514e5643407db2d02a5bd34bf33d159055dafa82825c8385bd01993" ,
7667 "linux-x86_64" : "b3b7f2801d15d50736acea3c73982994d025b01c2f035b91ae3b49d1b575732b" ,
7768 "darwin-aarch64" : "b95bdd32a33a81ee4d40363aaeb26728a26783fcef26a4d80f65457433ea4669" ,
78- "darwin-x86_64" : "b95bdd32a33a81ee4d40363aaeb26728a26783fcef26a4d80f65457433ea4669" , # Use ARM64 via Rosetta
7969 },
8070 strip_prefix = {
8171 "linux-aarch64" : "LLVM-21.1.8-Linux-ARM64" ,
8272 "linux-x86_64" : "LLVM-21.1.8-Linux-X64" ,
8373 "darwin-aarch64" : "LLVM-21.1.8-macOS-ARM64" ,
84- "darwin-x86_64" : "LLVM-21.1.8-macOS-ARM64" , # Use ARM64 via Rosetta
8574 },
8675 urls = {
8776 "linux-aarch64" : ["https://github.com/llvm/llvm-project/releases/download/llvmorg-21.1.8/LLVM-21.1.8-Linux-ARM64.tar.xz" ],
8877 "linux-x86_64" : ["https://github.com/llvm/llvm-project/releases/download/llvmorg-21.1.8/LLVM-21.1.8-Linux-X64.tar.xz" ],
8978 "darwin-aarch64" : ["https://github.com/llvm/llvm-project/releases/download/llvmorg-21.1.8/LLVM-21.1.8-macOS-ARM64.tar.xz" ],
90- "darwin-x86_64" : ["https://github.com/llvm/llvm-project/releases/download/llvmorg-21.1.8/LLVM-21.1.8-macOS-ARM64.tar.xz" ], # Use ARM64 via Rosetta
9179 },
9280 )
0 commit comments