From 180c7ddfacde608fd9bd7565d6c53a4a7db5034c Mon Sep 17 00:00:00 2001 From: Don Hinton Date: Mon, 29 Jan 2018 05:32:21 +0000 Subject: Revert: [compiler-rt] r323626 - [cmake] [compiler-rt] Remove duplicate CMAKE_CXX_FLAGS. Looks like it broke a bot: http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux-android/builds/7195 Reverting until I have a chance to investigate. git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@323629 91177308-0d34-0410-b5e6-96231b3b80d8 --- cmake/Modules/AddCompilerRT.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmake') diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake index 748042245..f81eb3342 100644 --- a/cmake/Modules/AddCompilerRT.cmake +++ b/cmake/Modules/AddCompilerRT.cmake @@ -64,7 +64,7 @@ function(add_compiler_rt_object_libraries name) endif() set_target_compile_flags(${libname} - ${extra_cflags_${libname}} ${target_flags}) + ${CMAKE_CXX_FLAGS} ${extra_cflags_${libname}} ${target_flags}) set_property(TARGET ${libname} APPEND PROPERTY COMPILE_DEFINITIONS ${LIB_DEFS}) set_target_properties(${libname} PROPERTIES FOLDER "Compiler-RT Libraries") -- cgit v1.2.3