diff options
| author | Aaron Smith <aaron.smith@microsoft.com> | 2018-04-11 17:31:18 +0000 |
|---|---|---|
| committer | Aaron Smith <aaron.smith@microsoft.com> | 2018-04-11 17:31:18 +0000 |
| commit | 9d41aea07c1cab656eda87bc0b790a3d7726a305 (patch) | |
| tree | 103a94ffe44e5e35ceb9132520e20a221e3ef76d /cmake/Modules | |
| parent | 26e37831a7a6c69bd2dda84fdc91554a428775cf (diff) | |
Revert "[cmake] Remove duplicate command line options from build"
The Android sanitizer buildbot is failing with this change and it
looks like an additional change to cmake is necessary to fix the
build. Reverting this change for now.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@329828 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake/Modules')
| -rw-r--r-- | cmake/Modules/AddCompilerRT.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake index a6a45f674..2383670a9 100644 --- a/cmake/Modules/AddCompilerRT.cmake +++ b/cmake/Modules/AddCompilerRT.cmake @@ -63,8 +63,8 @@ function(add_compiler_rt_object_libraries name) list(REMOVE_ITEM target_flags "-msse3") endif() - set_target_compile_flags(${libname} ${extra_cflags_${libname}} ${target_flags}) - + set_target_compile_flags(${libname} + ${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") |