Author: ericwf Date: Tue Jan 17 17:27:56 2017 New Revision: 292291 URL: http://llvm.org/viewvc/llvm-project?rev=292291&view=rev Log: Don't strip -m32 from the user provide command line flags. This fixes the compiler-rt 32 bit sanitizer build
Modified: libcxx/trunk/CMakeLists.txt Modified: libcxx/trunk/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/CMakeLists.txt?rev=292291&r1=292290&r2=292291&view=diff ============================================================================== --- libcxx/trunk/CMakeLists.txt (original) +++ libcxx/trunk/CMakeLists.txt Tue Jan 17 17:27:56 2017 @@ -395,7 +395,7 @@ include(HandleLibCXXABI) # Setup the ABI if (NOT LIBCXX_STANDALONE_BUILD) # Remove flags that may have snuck in. remove_flags(-DNDEBUG -UNDEBUG -D_DEBUG - -lc++abi -m32) + -lc++abi) endif() remove_flags(-stdlib=libc++ -stdlib=libstdc++) @@ -404,7 +404,7 @@ remove_flags(-stdlib=libc++ -stdlib=libs # non-debug DLLs remove_flags("/D_DEBUG" "/MTd" "/MDd" "/MT" "/Md") -# FIXME(EricWF): See the FIXME on LIBCXX_ENABLE_PEDANTIC. +# FIXME(EricWF): See the FIXME on LIBCXX_ENABLE_PEqDANTIC. # Remove the -pedantic flag and -Wno-pedantic and -pedantic-errors # so they don't get transformed into -Wno and -errors respectivly. remove_flags(-Wno-pedantic -pedantic-errors -pedantic) _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits