[Lldb-commits] [lldb] eaeb561 - debugserver: Rely on mig architectures being specified externally

[Vedant Kumar via lldb-commits]

Author: Vedant Kumar
Date: 2020-02-10T10:13:05-08:00
New Revision: eaeb5610ced23404f2c799d6e0c46c05f06ac3b5

URL: https://github.com/llvm/llvm-project/commit/eaeb5610ced23404f2c799d6e0c46c05f06ac3b5
DIFF: https://github.com/llvm/llvm-project/commit/eaeb5610ced23404f2c799d6e0c46c05f06ac3b5.diff

LOG: debugserver: Rely on mig architectures being specified externally

Look up the -arch flags to pass to the mig invocation from an
optionally-defined MIG_ARCHS variable. We can't use CMAKE_OSX_ARCHS
because the {i,tv,watch}OS builds don't use this mechanism to achieve
fat builds (they build each slice separately & then lipo them together).

This supercedes the mig -arch/-isysroot fix from
510758dae2a8fa4b0b26dea89d4d1efd576b8ad6.

Added: 
    

Modified: 
    lldb/tools/debugserver/source/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/lldb/tools/debugserver/source/CMakeLists.txt b/lldb/tools/debugserver/source/CMakeLists.txt
index ef8dcd1f5353..151386d0c130 100644
--- a/lldb/tools/debugserver/source/CMakeLists.txt
+++ b/lldb/tools/debugserver/source/CMakeLists.txt
@@ -136,9 +136,11 @@ set(generated_mach_interfaces
   )
 
 set(MIG_ARCH_FLAGS "")
-foreach(ARCH ${CMAKE_OSX_ARCHITECTURES})
-  set(MIG_ARCH_FLAGS "${MIG_ARCH_FLAGS} -arch ${ARCH}")
-endforeach()
+if (DEFINED MIG_ARCHS)
+  foreach(ARCH ${MIG_ARCHS})
+    set(MIG_ARCH_FLAGS "${MIG_ARCH_FLAGS} -arch ${ARCH}")
+  endforeach()
+endif()
 separate_arguments(MIG_ARCH_FLAGS_SEPARTED NATIVE_COMMAND "${MIG_ARCH_FLAGS}")
 
 add_custom_command(OUTPUT ${generated_mach_interfaces}