Teach the compiler-rt custom compilation and linking CMake rules used
for sanitizers to pass the C++ compilation and exe linking flags through from the host CMake configuration. We pass the target flags afterward, allowing them to trump flags as needed. This is particularly important when the flags direct Clang, even the just-built-Clang, toward the standard library, linker, and other tools to use. llvm-svn: 208896
This commit is contained in:
parent
d621120533
commit
57e0ec7d20
|
@ -14,7 +14,7 @@ macro(add_compiler_rt_object_library name arch)
|
|||
parse_arguments(LIB "SOURCES;CFLAGS;DEFS" "" ${ARGN})
|
||||
add_library(${name}.${arch} OBJECT ${LIB_SOURCES})
|
||||
set_target_compile_flags(${name}.${arch}
|
||||
${TARGET_${arch}_CFLAGS} ${LIB_CFLAGS})
|
||||
${CMAKE_CXX_FLAGS} ${TARGET_${arch}_CFLAGS} ${LIB_CFLAGS})
|
||||
set_property(TARGET ${name}.${arch} APPEND PROPERTY
|
||||
COMPILE_DEFINITIONS ${LIB_DEFS})
|
||||
else()
|
||||
|
@ -136,6 +136,8 @@ macro(add_compiler_rt_test test_suite test_name)
|
|||
if(NOT COMPILER_RT_STANDALONE_BUILD)
|
||||
list(APPEND TEST_DEPS clang)
|
||||
endif()
|
||||
set(TEST_LINK_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${TEST_LINK_FLAGS}")
|
||||
separate_arguments(TEST_LINK_FLAGS)
|
||||
add_custom_target(${test_name}
|
||||
# MSVS CL doesn't allow a space between -Fe and the output file name.
|
||||
COMMAND ${COMPILER_RT_TEST_COMPILER} ${TEST_OBJECTS}
|
||||
|
|
Loading…
Reference in New Issue