Skip to content

Fix Darwin Universal build #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: backtrace
Choose a base branch
from
Open

Fix Darwin Universal build #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fdcc93
Fix Darwin Universal build
May 24, 2025
526dcc0
Add CI for macOS Universal build
May 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,10 @@ jobs:
matrix:
arch: [arm64, x86_64]
generator: ["Unix Makefiles", Ninja]
include:
- arch: "arm64;x86_64"
generator: Ninja
arch_name: universal

steps:
# Install latest CMake.
Expand All @@ -128,10 +132,18 @@ jobs:
with:
submodules: recursive

- name: Set arch name
run: |
if [ -z "${{ matrix.arch_name }}" ]; then
echo "arch_name=${{ matrix.arch }}" >> $GITHUB_ENV
else
echo "arch_name=${{ matrix.arch_name }}" >> $GITHUB_ENV
fi

- name: CMake
run: |
mkdir cbuild
cmake -S . -B cbuild/ -DCRASHPAD_BUILD_EXAMPLES=TRUE -DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }} -DCMAKE_OSX_SYSROOT=$(xcrun --sdk macosx --show-sdk-path) -G "${{ matrix.generator }}"
cmake -S . -B cbuild/ -DCRASHPAD_BUILD_EXAMPLES=TRUE "-DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }}" -DCMAKE_OSX_SYSROOT=$(xcrun --sdk macosx --show-sdk-path) -G "${{ matrix.generator }}"
cmake --build cbuild/

- uses: ruby/setup-ruby@v1
Expand All @@ -142,12 +154,12 @@ jobs:

- name: Crashpad distribution ZIP
run: |
ruby backtrace/save_artifacts.rb --output Crashpad_MacOs_build_${{ matrix.arch }}.zip
ruby backtrace/save_artifacts.rb --output Crashpad_MacOs_build_${{ env.arch_name }}.zip

- uses: actions/upload-artifact@v4
with:
name: Crashpad_MacOs_build_${{ matrix.arch }}_${{ matrix.generator }}_${{ github.sha }}
path: Crashpad_MacOs_build_${{ matrix.arch }}.zip
name: Crashpad_MacOs_build_${{ env.arch_name }}_${{ matrix.generator }}_${{ github.sha }}
path: Crashpad_MacOs_build_${{ env.arch_name }}.zip

build-android:
runs-on: ubuntu-22.04
Expand Down
14 changes: 10 additions & 4 deletions util/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,18 +377,24 @@ if (APPLE)
list(APPEND OUTPUT_FILES "${OUTPUT_PATH}/${BASE_NAME}${SUFFIX}")
endforeach()

if (${CMAKE_OSX_ARCHITECTURES})
set(MIG_ARCH ${CMAKE_OSX_ARCHITECTURES})
if(CMAKE_OSX_ARCHITECTURES)
set(OSX_ARCHITECTURES ${CMAKE_OSX_ARCHITECTURES})
else()
set(MIG_ARCH "arm64")
set(OSX_ARCHITECTURES ${CMAKE_SYSTEM_PROCESSOR})
endif()

set(MIG_ARCH)
foreach(ARCH ${OSX_ARCHITECTURES})
list(APPEND MIG_ARCH "--arch")
list(APPEND MIG_ARCH ${ARCH})
endforeach()

add_custom_command(
OUTPUT
${OUTPUT_FILES}
COMMAND
"${Python3_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/mach/mig.py"
"--arch" ${MIG_ARCH}
${MIG_ARCH}
"--sdk" ${CMAKE_OSX_SYSROOT}
"--include=${CMAKE_CURRENT_SOURCE_DIR}/.."
"--include=${CMAKE_CURRENT_SOURCE_DIR}/../compat/mac"
Expand Down