[compiler-rt] r329828 - Revert "[cmake] Remove duplicate command line options from build"

[Aaron Smith via llvm-commits]

Author: asmith
Date: Wed Apr 11 10:31:18 2018
New Revision: 329828

URL: http://llvm.org/viewvc/llvm-project?rev=329828&view=rev
Log:
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.

Modified:
    compiler-rt/trunk/cmake/Modules/AddCompilerRT.cmake

Modified: compiler-rt/trunk/cmake/Modules/AddCompilerRT.cmake
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/cmake/Modules/AddCompilerRT.cmake?rev=329828&r1=329827&r2=329828&view=diff
==============================================================================
--- compiler-rt/trunk/cmake/Modules/AddCompilerRT.cmake (original)
+++ compiler-rt/trunk/cmake/Modules/AddCompilerRT.cmake Wed Apr 11 10:31:18 2018
@@ -63,8 +63,8 @@ function(add_compiler_rt_object_librarie
       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")