Macos CI failing on M1

Updated paths using $(brew --prefix llvm@17)/bin
jbaldwin · May 24, 2024 · 5e76f87 · 5e76f87
1 parent 3e3f948
commit 5e76f87
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml
@@ -25,13 +25,15 @@ jobs:
                     submodules: recursive
             -   name: Release
                 run: |
+                    brew --prefix llvm@17
+                    ls $(brew --prefix llvm@17)/bin
                     mkdir Release
                     cd Release
                     cmake \
                         -GNinja \
                         -DCMAKE_BUILD_TYPE=Release \
-                        -DCMAKE_C_COMPILER=/usr/local/opt/llvm/bin//clang-${{ matrix.clang_version }} \
-                        -DCMAKE_CXX_COMPILER=/usr/local/opt/llvm/bin//clang-${{ matrix.clang_version }} \
+                        -DCMAKE_C_COMPILER=$(brew --prefix llvm@${{ matrix.clang_version }})/bin/clang-${{ matrix.clang_version }} \
+                        -DCMAKE_CXX_COMPILER=$(brew --prefix llvm@${{ matrix.clang_version }})/bin/clang-${{ matrix.clang_version }} \
                         -DCMAKE_CXX_STANDARD=${{ matrix.cxx_standard }} \
                         -DLIBCORO_FEATURE_NETWORKING=${{ matrix.libcoro_feature_networking.enabled }} \
                         -DLIBCORO_FEATURE_TLS=${{ matrix.libcoro_feature_networking.tls }} \

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,9 +8,6 @@ project(libcoro
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     set(MACOSX TRUE)
-    # We need to build with clang >= 17, assuming its installed by
-    # brew. We also need to force linking to libc++.a
-    add_link_options(-L/usr/local/opt/llvm/lib)
     link_libraries(-lc++)
 endif()