Skip to content

Commit 8b3e36f

Browse files
committed
GH Actions Vanilla LLVM: Switch LLVM 14 job from Linux to macOS
1 parent 4b8e8cf commit 8b3e36f

File tree

1 file changed

+10
-14
lines changed

1 file changed

+10
-14
lines changed

.github/workflows/supported_llvm_versions.yml

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,6 @@ jobs:
1919
os: ubuntu-20.04
2020
host_dc: ldc-beta
2121
llvm_version: 15.0.6
22-
- job_name: Ubuntu 20.04, LLVM 14, latest LDC beta
23-
os: ubuntu-20.04
24-
host_dc: ldc-beta
25-
llvm_version: 14.0.0
26-
# the compiler-rt libs installation is somehow non-standard
27-
cmake_flags: -DLDC_INSTALL_LLVM_RUNTIME_LIBS_OS=x86_64-unknown-linux-gnu -DLDC_INSTALL_LLVM_RUNTIME_LIBS_ARCH=""
2822
- job_name: Ubuntu 20.04, LLVM 12, latest LDC beta
2923
os: ubuntu-20.04
3024
host_dc: ldc-beta
@@ -35,18 +29,20 @@ jobs:
3529
host_dc: dmd-beta
3630
llvm_version: 11.1.0
3731
cmake_flags: -DBUILD_SHARED_LIBS=OFF -DRT_SUPPORT_SANITIZERS=ON -DLDC_LINK_MANUALLY=ON
38-
#- job_name: macOS 11, LLVM 10, latest DMD beta
39-
# os: macos-11
40-
# host_dc: dmd-beta
41-
# llvm_version: 10.0.1
42-
# cmake_flags: -DBUILD_SHARED_LIBS=ON -DRT_SUPPORT_SANITIZERS=ON -DLDC_LINK_MANUALLY=ON -DCMAKE_CXX_COMPILER=/usr/bin/c++ -DCMAKE_C_COMPILER=/usr/bin/cc -DCMAKE_OSX_DEPLOYMENT_TARGET=11.0
43-
- job_name: macOS 11, LLVM 13, latest LDC beta
32+
- job_name: macOS 11, LLVM 13, latest DMD beta
4433
os: macos-11
45-
host_dc: ldc-beta
34+
host_dc: dmd-beta
4635
llvm_version: 13.0.1
47-
cmake_flags: -DBUILD_SHARED_LIBS=OFF -DD_COMPILER_FLAGS=-gcc=/usr/bin/c++ -DCMAKE_OSX_DEPLOYMENT_TARGET=11.0
36+
cmake_flags: -DBUILD_SHARED_LIBS=ON -DRT_SUPPORT_SANITIZERS=ON -DLDC_LINK_MANUALLY=ON -DCMAKE_CXX_COMPILER=/usr/bin/c++ -DCMAKE_C_COMPILER=/usr/bin/cc
37+
- job_name: macOS 11, LLVM 14, latest LDC beta
38+
os: macos-11
39+
host_dc: ldc-beta
40+
llvm_version: 14.0.6
41+
cmake_flags: -DBUILD_SHARED_LIBS=OFF -DD_COMPILER_FLAGS=-gcc=/usr/bin/c++
4842
name: ${{ matrix.job_name }}
4943
runs-on: ${{ matrix.os }}
44+
env:
45+
MACOSX_DEPLOYMENT_TARGET: 11.6 # silence `ld: warning: object file (…) was built for newer macOS version (…) than being linked (…)`
5046
steps:
5147
- uses: actions/checkout@v3
5248
with:

0 commit comments

Comments
 (0)