File tree 3 files changed +5
-2
lines changed
3 files changed +5
-2
lines changed Original file line number Diff line number Diff line change @@ -21,11 +21,12 @@ if get_target_os() in ['windows-msvc']:
21
21
else:
22
22
# FIXME(compnerd) do all the targets we currently support use SysV ABI?
23
23
config.substitutions.insert(0, (' %target-abi' , ' SYSV' ))
24
+ config.substitutions.insert(0, (' %cmake-c-compiler' , config.cmake_c_compiler))
24
25
config.substitutions.insert(
25
26
0,
26
27
(
27
28
' %swift-build-c-plugin' ,
28
- ' %clang %c-flags %exe-linker-flags -isysroot %host_sdk -I %swift_src_root/include -L %swift-lib-dir -l_swiftMockPlugin -Xlinker -rpath -Xlinker %swift-lib-dir'
29
+ ' %cmake-c-compiler %c-flags %exe-linker-flags -target %host_triple -isysroot %host_sdk -I %swift_src_root/include -L %swift-lib-dir -l_swiftMockPlugin -Xlinker -rpath -Xlinker %swift-lib-dir'
29
30
)
30
31
)
31
32
config.substitutions.append((' %c-flags' , config.c_flags))
Original file line number Diff line number Diff line change @@ -44,6 +44,8 @@ config.swift_driver_test_options = "@SWIFT_DRIVER_TEST_OPTIONS@"
44
44
config .swift_frontend_test_options = "@SWIFT_FRONTEND_TEST_OPTIONS@"
45
45
config .swift_ide_test_test_options = "@SWIFT_IDE_TEST_TEST_OPTIONS@"
46
46
47
+ config .cmake_c_compiler = r'''@CMAKE_C_COMPILER@'''
48
+ config .cmake_cxx_compiler = r'''@CMAKE_CXX_COMPILER@'''
47
49
config .c_flags = r'''@CMAKE_C_FLAGS@'''
48
50
config .exe_linker_flags = r'''@CMAKE_EXE_LINKER_FLAGS@'''
49
51
Original file line number Diff line number Diff line change @@ -16,4 +16,4 @@ add_llvm_symbol_exports(libMockPlugin ${LLVM_EXPORTED_SYMBOL_FILE})
16
16
17
17
add_dependencies (tools libMockPlugin)
18
18
# Adds -dead_strip option
19
- add_link_opts(libStaticMirror )
19
+ add_link_opts(libMockPlugin )
You can’t perform that action at this time.
0 commit comments