[Macros/Tests] Build test plugins with the same compiler as the dylib #70213
Conversation
Sanitizer ABI are apparently not stable. We need to build the executable with the same compiler as the linking dylib. rdar://119141141
This reverts commit 26122f6.
|
@swift-ci Please smoke test |
|
preset=asan |
| @@ -21,11 +21,12 @@ if get_target_os() in ['windows-msvc']: | |||
| else: | |||
| # FIXME(compnerd) do all the targets we currently support use SysV ABI? | |||
| config.substitutions.insert(0, ('%target-abi', 'SYSV')) | |||
| config.substitutions.insert(0, ('%cmake-c-compiler', config.cmake_c_compiler)) | |||
There was a problem hiding this comment.
Should we also insert cmake-cxx-compiler? Or not add it to the cfg, since it is otherwise unused?
There was a problem hiding this comment.
My vote goes to remove config.cmake_cxx_compiler = r'''@CMAKE_CXX_COMPILER@''', if it is not needed. Not a big deal if it stays there, in any case.
There was a problem hiding this comment.
Since the tests are already running, let me leave it as-is. 👍
| config.substitutions.insert( | ||
| 0, | ||
| ( | ||
| '%swift-build-c-plugin', | ||
| '%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' | ||
| '%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' |
There was a problem hiding this comment.
-target %host_triple this doesn't seem to be necessary, but still.
| @@ -16,4 +16,4 @@ add_llvm_symbol_exports(libMockPlugin ${LLVM_EXPORTED_SYMBOL_FILE}) | |||
|
|
|||
| add_dependencies(tools libMockPlugin) | |||
| # Adds -dead_strip option | |||
| add_link_opts(libStaticMirror) | |||
| add_link_opts(libMockPlugin) | |||
There was a problem hiding this comment.
Drive-by fix. libStaticMirror was just copy-pasted from somewhere.
| @@ -21,11 +21,12 @@ if get_target_os() in ['windows-msvc']: | |||
| else: | |||
| # FIXME(compnerd) do all the targets we currently support use SysV ABI? | |||
| config.substitutions.insert(0, ('%target-abi', 'SYSV')) | |||
| config.substitutions.insert(0, ('%cmake-c-compiler', config.cmake_c_compiler)) | |||
There was a problem hiding this comment.
My vote goes to remove config.cmake_cxx_compiler = r'''@CMAKE_CXX_COMPILER@''', if it is not needed. Not a big deal if it stays there, in any case.
|
@swift-ci Please smoke test Windows |
1 similar comment
|
@swift-ci Please smoke test Windows |
Sanitizer ABI are apparently not stable. We need to build the executable with the same compiler as the linking dylib.
rdar://119141141