this repo has no description
Merge pull request #1513 from darlinghq/mig_fix
Mig Fixes
authored by
CuriousTommy
and committed by
GitHub
f46eb721
7c8415e6
+7
-2
+2
cmake/architecture.cmake
+2
cmake/architecture.cmake
···
28
28
29
29
if (BUILD_TARGET_64BIT)
30
30
set(APPLE_TARGET_TRIPLET_PRIMARY ${APPLE_TARGET_TRIPLET_64BIT})
31
+
set(APPLE_ARCH_PRIMARY ${APPLE_ARCH_64BIT})
31
32
elseif (BUILD_TARGET_32BIT)
32
33
set(APPLE_TARGET_TRIPLET_PRIMARY ${APPLE_TARGET_TRIPLET_32BIT})
34
+
set(APPLE_ARCH_PRIMARY ${APPLE_ARCH_32BIT})
33
35
else ()
34
36
set(APPLE_TARGET_TRIPLET_PRIMARY "")
35
37
endif ()
+5
-2
cmake/mig.cmake
+5
-2
cmake/mig.cmake
···
38
38
if (NOT MIG_MULTIARCH)
39
39
set(MIG_MULTIARCH_NO_SUFFIX 1)
40
40
if (NOT MIG_ARCH)
41
-
set(MIG_MULTIARCH "i386")
41
+
set(MIG_MULTIARCH "${APPLE_ARCH_PRIMARY}")
42
42
else()
43
43
set(MIG_MULTIARCH "${MIG_ARCH}")
44
44
endif()
45
45
endif()
46
+
47
+
# TODO: Add support for multi-triplet targets
48
+
set(MIG_TARGET_TRIPLET_PRIMARY "${APPLE_TARGET_TRIPLET_PRIMARY}")
46
49
47
50
foreach(MIG_ARCH ${MIG_MULTIARCH})
48
51
if (MIG_MULTIARCH_NO_SUFFIX)
···
61
64
/bin/mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/${dirName} \;
62
65
${MIG_EXECUTABLE}
63
66
-arch ${MIG_ARCH}
64
-
-target ${MIG_ARCH}
67
+
-target ${MIG_TARGET_TRIPLET_PRIMARY}
65
68
-user ${CMAKE_CURRENT_BINARY_DIR}/${relativeName}${MIG_ARCH_SUFFIX}${MIG_USER_SOURCE_SUFFIX}
66
69
-header ${CMAKE_CURRENT_BINARY_DIR}/${relativeName}${MIG_ARCH_SUFFIX}${MIG_USER_HEADER_SUFFIX}
67
70
-server ${CMAKE_CURRENT_BINARY_DIR}/${relativeName}${MIG_ARCH_SUFFIX}${MIG_SERVER_SOURCE_SUFFIX}