@@ -15,28 +15,6 @@ if(NOT SwiftCore_MODULE_TRIPLE)
1515 "${target_info_json} " )
1616 string (JSON module_triple GET "${target_info_json} " "target" "moduleTriple" )
1717 set (SwiftCore_MODULE_TRIPLE "${module_triple} " CACHE STRING "swift module triple used for installed swiftmodule and swiftinterface files" )
18+ message (CONFIGURE_LOG "Swift module triple: ${module_triple} " )
1819 mark_as_advanced (SwiftCore_MODULE_TRIPLE)
1920endif ()
20-
21- if (NOT SwiftCore_SWIFTC_CLANGIMPORTER_RESOURCE_DIR)
22- # TODO: We need to separate the concept of compiler resources and the stdlib.
23- # Compiler-resources in the compiler-resource directory are specific to
24- # a given compiler. The headers in `lib/clang/<version>/include` and
25- # `lib/swift/clang/include` correspond with that specific copy clang and
26- # should not be mixed. This won't cause modularization issues because
27- # the one copy of clang should never be looking in the other's resource
28- # directory. If there are issues here, something has gone horribly wrong
29- # and you're looking in the wrong place.
30- set (module_triple_command "${CMAKE_Swift_COMPILER} " -print-target -info)
31- if (CMAKE_Swift_COMPILER_TARGET)
32- list (APPEND module_triple_command -target ${CMAKE_Swift_COMPILER_TARGET} )
33- endif ()
34- execute_process (COMMAND ${module_triple_command} OUTPUT_VARIABLE target_info_json)
35- string (JSON resource_dir GET "${target_info_json} " "paths" "runtimeResourcePath" )
36- cmake_path(APPEND resource_dir "clang" )
37- message (CONFIGURE_LOG "Using Swift clang-importer headers from toolchain Swift\n "
38- "clang-importer header directory: ${resource_dir} " )
39- set (SwiftCore_SWIFTC_CLANGIMPORTER_RESOURCE_DIR "${resource_dir} "
40- CACHE FILEPATH "Swift clang-importer resource directory" )
41- mark_as_advanced (SwiftCore_SWIFTC_CLANGIMPORTER_RESOURCE_DIR)
42- endif ()
0 commit comments