Update macosx_build.yml (#974)

* set SDKROOT

* cleanup include paths

Author: opcm

.github/workflows/macos-scan-build.yml

@@ -20,9 +20,18 @@ jobs:
       with:
         egress-policy: audit
 
-    - uses: maxim-lobanov/setup-xcode@v1
-      with:
-        xcode-version: '14.3.1'
+    - name: Select Xcode 14.3.1
+      run: sudo xcode-select -s /Applications/Xcode_14.3.1.app/Contents/Developer
+
+    - name: Set SDKROOT and verify kernel headers
+      shell: bash
+      run: |
+          SDKROOT="$(xcrun --sdk macosx --show-sdk-path)"
+          echo "SDKROOT=$SDKROOT" >> "$GITHUB_ENV"
+          test -f "$SDKROOT/System/Library/Frameworks/Kernel.framework/Headers/IOKit/IOLib.h" || {
+            echo "Kernel IOLib.h not found under SDK: $SDKROOT" >&2
+            exit 1
+          }
 
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       with:

.github/workflows/macosx_build.yml

@@ -20,9 +20,18 @@ jobs:
       with:
         egress-policy: audit
 
-    - uses: maxim-lobanov/setup-xcode@v1
-      with:
-        xcode-version: '14.3.1'
+    - name: Select Xcode 14.3.1
+      run: sudo xcode-select -s /Applications/Xcode_14.3.1.app/Contents/Developer
+
+    - name: Set SDKROOT and verify kernel headers
+      shell: bash
+      run: |
+          SDKROOT="$(xcrun --sdk macosx --show-sdk-path)"
+          echo "SDKROOT=$SDKROOT" >> "$GITHUB_ENV"
+          test -f "$SDKROOT/System/Library/Frameworks/Kernel.framework/Headers/IOKit/IOLib.h" || {
+            echo "Kernel IOLib.h not found under SDK: $SDKROOT" >&2
+            exit 1
+          }
 
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       with:

src/MacMSRDriver/PcmMsr/CMakeLists.txt

@@ -15,8 +15,6 @@ set_target_properties(PcmMsrDriver PROPERTIES BUNDLE_EXTENSION kext MACOSX_BUNDL
 target_include_directories(PcmMsrDriver PRIVATE
         ${CMAKE_OSX_SYSROOT}/System/Library/Frameworks/Kernel.framework/PrivateHeaders
         ${CMAKE_OSX_SYSROOT}/System/Library/Frameworks/Kernel.framework/Headers
-        ${CMAKE_OSX_SYSROOT}/System/Library/Frameworks/Kernel.framework/Versions/A/Headers
-        /Applications/Xcode_15.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/IOKit.framework/Headers
 )
 target_compile_definitions(PcmMsrDriver PRIVATE
         -DKERNEL