Merge pull request #2038 from dcci/ondevice-crosscomp

Author: swift-ci

cmake/modules/LLDBFramework.cmake

@@ -83,11 +83,13 @@ add_dependencies(liblldb liblldb-resource-headers)
 
 # At build time, copy the staged headers into the framework bundle (and do
 # some post-processing in-place).
+if (NOT IOS)
 add_custom_command(TARGET liblldb POST_BUILD
   COMMAND ${CMAKE_COMMAND} -E copy_directory ${lldb_header_staging} $<TARGET_FILE_DIR:liblldb>/Headers
   COMMAND ${LLDB_SOURCE_DIR}/scripts/framework-header-fix.sh $<TARGET_FILE_DIR:liblldb>/Headers ${LLDB_VERSION}
   COMMENT "LLDB.framework: copy framework headers"
 )
+endif()
 
 # Copy vendor-specific headers from clang (without staging).
 if(NOT IOS)

tools/debugserver/source/MacOSX/MachVMMemory.cpp

@@ -20,7 +20,7 @@
 
 #if defined(WITH_FBS) || defined(WITH_BKS)
 extern "C" {
-#import <sys/kern_memorystatus.h>
+#import <System/sys/kern_memorystatus.h>
 }
 #endif