this repo has no description
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Set Fall Back Arch To The Primary Arch For MIG

I was looking through the build scripts in XNU to see how MIG is being used. While there are some cases where we need to explicitly set the arch to its 32-bit equivalent (ex: i386 instead of x86-64), those situations seem to be the exception rather than the norm.

As a result, I don't think we should be hardcoding i386 as a fallback. We should use the primary architecture instead.

+3 -1
+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 ()
+1 -1
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()