Merge pull request #1513 from darlinghq/mig_fix

Mig Fixes
darlinghq · May 11, 2024 · f46eb72 · f46eb72
2 parents 7c8415e + 0b6b8a3
commit f46eb72
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/cmake/architecture.cmake b/cmake/architecture.cmake
@@ -28,8 +28,10 @@ macro(generate_architecture)
 
     if (BUILD_TARGET_64BIT)
         set(APPLE_TARGET_TRIPLET_PRIMARY ${APPLE_TARGET_TRIPLET_64BIT})
+        set(APPLE_ARCH_PRIMARY ${APPLE_ARCH_64BIT})
     elseif (BUILD_TARGET_32BIT)
         set(APPLE_TARGET_TRIPLET_PRIMARY ${APPLE_TARGET_TRIPLET_32BIT})
+        set(APPLE_ARCH_PRIMARY ${APPLE_ARCH_32BIT})
     else ()
         set(APPLE_TARGET_TRIPLET_PRIMARY "")
     endif ()

diff --git a/cmake/mig.cmake b/cmake/mig.cmake
@@ -38,12 +38,15 @@ function(mig defFileName)
 	if (NOT MIG_MULTIARCH)
 		set(MIG_MULTIARCH_NO_SUFFIX 1)
 		if (NOT MIG_ARCH)
-			set(MIG_MULTIARCH "i386")
+			set(MIG_MULTIARCH "${APPLE_ARCH_PRIMARY}")
 		else()
 			set(MIG_MULTIARCH "${MIG_ARCH}")
 		endif()
 	endif()
 
+	# TODO: Add support for multi-triplet targets
+	set(MIG_TARGET_TRIPLET_PRIMARY "${APPLE_TARGET_TRIPLET_PRIMARY}")
+
 	foreach(MIG_ARCH ${MIG_MULTIARCH})
 		if (MIG_MULTIARCH_NO_SUFFIX)
 			set(MIG_ARCH_SUFFIX "")
@@ -61,7 +64,7 @@ function(mig defFileName)
 				/bin/mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/${dirName} \;
 				${MIG_EXECUTABLE}
 				-arch ${MIG_ARCH}
-				-target ${MIG_ARCH}
+				-target ${MIG_TARGET_TRIPLET_PRIMARY}
 				-user ${CMAKE_CURRENT_BINARY_DIR}/${relativeName}${MIG_ARCH_SUFFIX}${MIG_USER_SOURCE_SUFFIX}
 				-header ${CMAKE_CURRENT_BINARY_DIR}/${relativeName}${MIG_ARCH_SUFFIX}${MIG_USER_HEADER_SUFFIX}
 				-server ${CMAKE_CURRENT_BINARY_DIR}/${relativeName}${MIG_ARCH_SUFFIX}${MIG_SERVER_SOURCE_SUFFIX}