Enable osx cling jobs (minus openmp)

compiler-research · Feb 8, 2024 · a766eca · a766eca
1 parent a07c289
commit a766eca
Showing 1 changed file with 25 additions and 16 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -52,13 +52,13 @@ jobs:
             clang-runtime: '16'
             cling: Off
             cppyy: On
-          #- name: osx13-x86-clang-cling
-          #  os: macos-13
-          #  compiler: clang
-          #  clang-runtime: '13'
-          #  cling: On
-          #  cling-version: '1.0'
-          #  cppyy: On
+          - name: osx13-x86-clang-cling
+            os: macos-13
+            compiler: clang
+            clang-runtime: '13'
+            cling: On
+            cling-version: '1.0'
+            cppyy: On
           - name: osx14-arm-clang-clang17
             os: macos-14
             compiler: clang
@@ -71,13 +71,13 @@ jobs:
             clang-runtime: '16'
             cling: Off
             cppyy: On
-          #- name: osx14-arm-clang-cling
-          #  os: macos-14
-          #  compiler: clang
-          #  clang-runtime: '13'
-          #  cling: On
-          #  cling-version: '1.0'
-          #  cppyy: On
+          - name: osx14-arm-clang-cling
+            os: macos-14
+            compiler: clang
+            clang-runtime: '13'
+            cling: On
+            cling-version: '1.0'
+            cppyy: On
 
     steps:
     - uses: actions/checkout@v3
@@ -186,6 +186,7 @@ jobs:
           brew link --overwrite "$pkg"
         done
         brew upgrade
+        brew install libomp
         
     - name: Restore Cache LLVM/Clang runtime build directory
       uses: actions/cache/restore@v3
@@ -217,12 +218,20 @@ jobs:
         mkdir inst
         if [[ "${cling_on}" == "ON" ]]; then
           cd build
-          cmake -DLLVM_ENABLE_PROJECTS="clang;openmp"         \
+          #FIXME: Unable to compile root-project/llvm-project openmp
+          #on osx on Github runner, despite being able to locally
+          os="${{ matrix.os }}"
+          if [[ "${os}" == "macos"* ]]; then
+            PROJECTS=clang
+          else
+            PROJECTS='clang;openmp'
+          fi
+          cmake -DLLVM_ENABLE_PROJECTS=$projects              \
                 -DLLVM_EXTERNAL_PROJECTS=cling                \
                 -DLLVM_EXTERNAL_CLING_SOURCE_DIR=$CLING_DIR   \
                 -DLLVM_TARGETS_TO_BUILD="host;NVPTX"          \
                 -DCMAKE_BUILD_TYPE=Release                    \
-                -DLLVM_OPTIMIZED_TABLEGEN=OFF                  \
+                -DLLVM_OPTIMIZED_TABLEGEN=OFF                 \
                 -DLLVM_ENABLE_ASSERTIONS=ON                   \
                 -DCLANG_ENABLE_STATIC_ANALYZER=OFF            \
                 -DCLANG_ENABLE_ARCMT=OFF                      \