File tree Expand file tree Collapse file tree 3 files changed +5
-10
lines changed Expand file tree Collapse file tree 3 files changed +5
-10
lines changed Original file line number Diff line number Diff line change @@ -49,19 +49,14 @@ runs:
4949 sudo ln -sf $tool-19 /usr/bin/$tool
5050 $tool --version
5151 done
52- - name : ' macOS arm64: Install clang 19 from GitHub ' # see mimalloc comment in ../3-build-native/action.yml
52+ - name : ' macOS arm64: Install clang 19' # see mimalloc comment in ../3-build-native/action.yml
5353 if : runner.os == 'macOS' && inputs.arch == 'arm64'
5454 shell : bash
5555 run : |
5656 set -eux
5757 cd ..
58- curl -fL --retry 3 --max-time 300 -o clang.tar.xz \
59- https://github.com/llvm/llvm-project/releases/download/llvmorg-19.1.7/LLVM-19.1.7-macOS-ARM64.tar.xz
60- mkdir clang
61- tar -xf clang.tar.xz --strip 1 -C clang
62- rm clang.tar.xz
6358 # also upgrade CMake to v4
64- brew install cmake
59+ brew install llvm@19 cmake
6560 cmake --version
6661 - name : ' Windows: Install clang v19.1.3 from GitHub'
6762 if : runner.os == 'Windows'
Original file line number Diff line number Diff line change 8585 os : macos-14
8686 arch : arm64
8787 extra_cmake_flags : >-
88- -DCMAKE_C_COMPILER=$PWD/../clang /bin/clang
89- -DCMAKE_CXX_COMPILER=$PWD/../clang /bin/clang++
88+ -DCMAKE_C_COMPILER=$(brew --prefix llvm@19) /bin/clang
89+ -DCMAKE_CXX_COMPILER=$(brew --prefix llvm@19) /bin/clang++
9090 -DD_COMPILER_FLAGS="-O -flto=full -defaultlib=phobos2-ldc-lto,druntime-ldc-lto -L-exported_symbol '-L__*' -L-w"
9191 -DEXTRA_CXXFLAGS=-flto=full
9292 with_pgo : true
Original file line number Diff line number Diff line change @@ -317,7 +317,7 @@ if(UNIX AND LDC_FULLY_STATIC)
317317endif ()
318318
319319# Suppress superfluous randlib warnings about "*.a" having no symbols on MacOSX.
320- if (APPLE )
320+ if (${CMAKE_CXX_COMPILER_ID} STREQUAL "AppleClang" ) # not supported by llvm-ranlib used with Homebrew clang
321321 set (CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> Scr <TARGET> <LINK_FLAGS> <OBJECTS>" )
322322 set (CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> Scr <TARGET> <LINK_FLAGS> <OBJECTS>" )
323323 set (CMAKE_C_ARCHIVE_FINISH "<CMAKE_RANLIB> -no_warning_for_no_symbols -c <TARGET>" )
You can’t perform that action at this time.
0 commit comments