@@ -34,6 +34,24 @@ index e0a3b4465a3..c01af893eda 100644
34
34
35
35
// RUN: %target-build-swift -target %target-swift-5.2-abi-triple -Xfrontend -enable-anonymous-context-mangled-names %S/Inputs/ConcreteTypes.swift %S/Inputs/GenericTypes.swift %S/Inputs/Protocols.swift %S/Inputs/Extensions.swift %S/Inputs/Closures.swift -parse-as-library -emit-module -emit-library %no-fixup-chains -module-name TypesToReflect -o %t/%target-library-name(TypesToReflect)
36
36
// RUN: %target-build-swift -target %target-swift-5.2-abi-triple -Xfrontend -enable-anonymous-context-mangled-names %S/Inputs/ConcreteTypes.swift %S/Inputs/GenericTypes.swift %S/Inputs/Protocols.swift %S/Inputs/Extensions.swift %S/Inputs/Closures.swift %S/Inputs/main.swift -emit-module -emit-executable %no-fixup-chains -module-name TypesToReflect -o %t/TypesToReflect
37
+ diff --git a/swift/utils/swift_build_support/swift_build_support/cmake.py b/swift/utils/swift_build_support/swift_build_support/cmake.py
38
+ index 9a0f5b43e2d..5c7d1320a2d 100644
39
+ --- a/swift/utils/swift_build_support/swift_build_support/cmake.py
40
+ +++ b/swift/utils/swift_build_support/swift_build_support/cmake.py
41
+ @@ -150,11 +150,8 @@ class CMake(object):
42
+ define("CMAKE_CXX_COMPILER_LAUNCHER:PATH", args.cmake_cxx_launcher)
43
+
44
+ if self.prefer_native_toolchain and product:
45
+ - clang_tools_path = product.native_clang_tools_path(args.host_target)
46
+ - define("CMAKE_C_COMPILER:PATH", os.path.join(clang_tools_path,
47
+ - 'bin', 'clang'))
48
+ - define("CMAKE_CXX_COMPILER:PATH", os.path.join(clang_tools_path,
49
+ - 'bin', 'clang++'))
50
+ + define("CMAKE_C_COMPILER:PATH", toolchain.cc)
51
+ + define("CMAKE_CXX_COMPILER:PATH", toolchain.cxx)
52
+
53
+ toolchain_path = product.native_toolchain_path(args.host_target)
54
+ cmake_swiftc_path = os.getenv('CMAKE_Swift_COMPILER',
37
55
diff --git a/swift-corelibs-libdispatch/cmake/modules/SwiftSupport.cmake b/swift-corelibs-libdispatch/cmake/modules/SwiftSupport.cmake
38
56
index 3da519e..e2dd8ed 100644
39
57
--- a/swift-corelibs-libdispatch/cmake/modules/SwiftSupport.cmake
0 commit comments