Merge pull request #124 from quarkslab/update-ci

try switching back to Apple Clang CI

Author: RobinDavid

.github/workflows/build.yml

@@ -148,19 +148,14 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y liblzma-dev
 
-      - name: Install macOS dependencies
+      - name: Install liblzma (macOS)
         if: ${{ runner.os == 'macOS' && steps.ccache-cache.outputs.cache-hit != 'true' }}
-        run: brew install llvm@18 xz
+        run: brew install xz
 
       - name: Install liblzma (Windows)
         if: ${{ matrix.os == 'windows-latest' && steps.ccache-cache.outputs.cache-hit != 'true' }}
         run: vcpkg install liblzma:x64-windows
 
-      - name: Set LLVM_ROOT (macOS)
-        if: ${{ runner.os == 'macOS' && steps.ccache-cache.outputs.cache-hit != 'true' }}
-        shell: bash
-        run: echo "LLVM_ROOT_PARAM=-DLLVM_ROOT=$(brew --prefix llvm@18)" >> "$GITHUB_ENV"
-
       - name: Configure cmake
         if: steps.ccache-cache.outputs.cache-hit != 'true'
         shell: bash
@@ -171,8 +166,7 @@ jobs:
                 -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" \
                 -DIDA_VERSION=9.3 \
                 -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" \
-                -DFETCHCONTENT_BASE_DIR="$FETCHCONTENT_BASE_DIR" \
-                ${LLVM_ROOT_PARAM:+"$LLVM_ROOT_PARAM"}
+                -DFETCHCONTENT_BASE_DIR="$FETCHCONTENT_BASE_DIR"
 
       - name: Build
         if: steps.ccache-cache.outputs.cache-hit != 'true'
@@ -210,7 +204,7 @@ jobs:
         shell: bash
         run: |
           if [[ "$RUNNER_OS" == "macOS" ]]; then
-            brew install ccache llvm@18
+            brew install ccache
           else
             sudo apt-get update && sudo apt-get install -y ccache
           fi
@@ -244,20 +238,14 @@ jobs:
           ccache --set-config=compression=true
           ccache -z
 
-      - name: Set LLVM_ROOT (macOS)
-        if: ${{ runner.os == 'macOS' }}
-        shell: bash
-        run: echo "LLVM_ROOT_PARAM=-DLLVM_ROOT=$(brew --prefix llvm@18)" >> "$GITHUB_ENV"
-
       - name: Configure cmake
         shell: bash
         run: |
           cmake -B build-tests -S "$GITHUB_WORKSPACE" -G Ninja \
                 -DCMAKE_BUILD_TYPE=Debug \
                 -DNO_BUILD=On \
                 -DBUILD_TEST=On \
-                -DFETCHCONTENT_BASE_DIR="$FETCHCONTENT_BASE_DIR" \
-                ${LLVM_ROOT_PARAM:+"$LLVM_ROOT_PARAM"}
+                -DFETCHCONTENT_BASE_DIR="$FETCHCONTENT_BASE_DIR"
 
       - name: Build tests
         shell: bash
@@ -503,10 +491,10 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y liblzma-dev
 
-      - name: Install macOS dependencies
+      - name: Install liblzma (MacOS)
         if: ${{ matrix.os == 'macos-latest' }}
         run: |
-          brew install llvm@18 xz
+          brew install xz
 
       - name: Install liblzma (Windows)
         if: ${{ matrix.os == 'windows-latest' }}
@@ -523,7 +511,6 @@ jobs:
                 -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" "$CMAKE_IDA_PARAM" \
                 -DFETCHCONTENT_BASE_DIR="$FETCHCONTENT_BASE_DIR"
 
-      # We need to differentiate MacOS build from Linux because we want to use a specific compiler on MacOS
       - name: Prepare build environment (MacOS)
         if: ${{ matrix.os == 'macos-latest' }}
         env:
@@ -537,7 +524,6 @@ jobs:
                 -G Ninja \
                 -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" \
                 "$CMAKE_IDA_PARAM" \
-                -DLLVM_ROOT="$(brew --prefix llvm@18)" \
                 -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" \
                 -DFETCHCONTENT_BASE_DIR="$FETCHCONTENT_BASE_DIR"
 
@@ -624,7 +610,6 @@ jobs:
             echo "::error::No matching files found" && exit 1
           fi
           gh release upload "$TAG_NAME" "${files[@]}" --clobber
-
   # Package the IDA >= 9.1 plugins for the Hex-Rays plugin manager / marketplace.
   # This does NOT recompile: it reuses the binaries already built by the `build`
   # job, repackaging them into one quokka-ida<version>.zip per IDA version

CMakeLists.txt

@@ -97,27 +97,8 @@ endif ()
 
 if (UNIX)
     if(APPLE)
-        set(LLVM_HOMEBREW_FORMULA "llvm@18")
-        if(DEFINED LLVM_ROOT)
-            message(STATUS "Using provided LLVM_ROOT: ${LLVM_ROOT}")
-        else()
-            message(WARNING "LLVM_ROOT not provided via -DLLVM_ROOT. Falling back to Homebrew's ${LLVM_HOMEBREW_FORMULA}.")
-            execute_process(
-                COMMAND brew --prefix ${LLVM_HOMEBREW_FORMULA}
-                OUTPUT_VARIABLE LLVM_ROOT
-                OUTPUT_STRIP_TRAILING_WHITESPACE
-            )
-
-            message(STATUS "Using fallback LLVM_ROOT: ${LLVM_ROOT}")
-        endif()
-
-        if(NOT EXISTS "${LLVM_ROOT}/bin/clang" OR NOT EXISTS "${LLVM_ROOT}/bin/clang++")
-            message(FATAL_ERROR
-                "Failed to locate ${LLVM_HOMEBREW_FORMULA} compilers under LLVM_ROOT='${LLVM_ROOT}'. "
-                "Install it with 'brew install ${LLVM_HOMEBREW_FORMULA}' or provide LLVM_ROOT manually."
-            )
-        endif()
-
+        # Use the system Apple Clang toolchain (libc++ and the macOS SDK are its
+        # defaults). We intentionally do not pin a Homebrew LLVM here.
         add_compile_options(
             "$<$<CONFIG:Debug>:-gfull>"
             -Wno-nullability-completeness
@@ -142,8 +123,6 @@ if (UNIX)
 
         message(STATUS "Using macOS SDK: ${SDKROOT}")
 
-        set(CMAKE_C_COMPILER "${LLVM_ROOT}/bin/clang" CACHE FILEPATH "The C compiler")
-        set(CMAKE_CXX_COMPILER "${LLVM_ROOT}/bin/clang++" CACHE FILEPATH "The C++ compiler")
         set(CMAKE_OSX_SYSROOT "${SDKROOT}")
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -isysroot ${SDKROOT}")
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isysroot ${SDKROOT} -stdlib=libc++")