From 22b412f45cc2a6f03b33e1ed59d2ee4a65a8be4a Mon Sep 17 00:00:00 2001 From: Petr Hosek Date: Wed, 1 May 2019 05:41:58 +0000 Subject: [compiler-rt] Cleanup the --target and --sysroot handling This addresses issue introduced in r359646. git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@359650 91177308-0d34-0410-b5e6-96231b3b80d8 --- cmake/Modules/AddCompilerRT.cmake | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake index 8f49f3e7a..3970fb415 100644 --- a/cmake/Modules/AddCompilerRT.cmake +++ b/cmake/Modules/AddCompilerRT.cmake @@ -274,12 +274,11 @@ function(add_compiler_rt_runtime name type) endif() if(type STREQUAL "OBJECT") - get_property(cflags_${libname} SOURCE ${sources_${libname}} PROPERTY COMPILE_FLAGS) if(CMAKE_C_COMPILER_ID MATCHES Clang AND CMAKE_C_COMPILER_TARGET) - list(APPEND cflags_${libname} "--target=${CMAKE_C_COMPILER_TARGET}") + list(APPEND extra_cflags_${libname} "--target=${CMAKE_C_COMPILER_TARGET}") endif() if(CMAKE_SYSROOT) - list(APPEND cflags_${libname} "--sysroot=${CMAKE_SYSROOT}") + list(APPEND extra_cflags_${libname} "--sysroot=${CMAKE_SYSROOT}") endif() string(REPLACE ";" " " extra_cflags_${libname} "${extra_cflags_${libname}}") string(REGEX MATCHALL "<[A-Za-z0-9_]*>" substitutions @@ -297,7 +296,7 @@ function(add_compiler_rt_runtime name type) string(REPLACE "" "${sources_${libname}}" compile_command_${libname} ${compile_command_${libname}}) elseif(substitution STREQUAL "") - string(REPLACE "" "${CMAKE_C_FLAGS} ${cflags_${libname}} ${extra_cflags_${libname}}" + string(REPLACE "" "${CMAKE_C_FLAGS} ${extra_cflags_${libname}}" compile_command_${libname} ${compile_command_${libname}}) else() string(REPLACE "${substitution}" "" compile_command_${libname} -- cgit v1.2.1