Skip to content

Commit 9fdcc93

Browse files
author
Ihor Dutchak
committed
Fix Darwin Universal build
Properly use mig generator for Universal builds, e.g. when CMAKE_OSX_ARCHITECTURES=x86_64;arm64
1 parent dcfbd00 commit 9fdcc93

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

util/CMakeLists.txt

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -377,18 +377,24 @@ if (APPLE)
377377
list(APPEND OUTPUT_FILES "${OUTPUT_PATH}/${BASE_NAME}${SUFFIX}")
378378
endforeach()
379379

380-
if (${CMAKE_OSX_ARCHITECTURES})
381-
set(MIG_ARCH ${CMAKE_OSX_ARCHITECTURES})
380+
if(CMAKE_OSX_ARCHITECTURES)
381+
set(OSX_ARCHITECTURES ${CMAKE_OSX_ARCHITECTURES})
382382
else()
383-
set(MIG_ARCH "arm64")
383+
set(OSX_ARCHITECTURES ${CMAKE_SYSTEM_PROCESSOR})
384384
endif()
385385

386+
set(MIG_ARCH)
387+
foreach(ARCH ${OSX_ARCHITECTURES})
388+
list(APPEND MIG_ARCH "--arch")
389+
list(APPEND MIG_ARCH ${ARCH})
390+
endforeach()
391+
386392
add_custom_command(
387393
OUTPUT
388394
${OUTPUT_FILES}
389395
COMMAND
390396
"${Python3_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/mach/mig.py"
391-
"--arch" ${MIG_ARCH}
397+
${MIG_ARCH}
392398
"--sdk" ${CMAKE_OSX_SYSROOT}
393399
"--include=${CMAKE_CURRENT_SOURCE_DIR}/.."
394400
"--include=${CMAKE_CURRENT_SOURCE_DIR}/../compat/mac"

0 commit comments

Comments
 (0)