diff options
| author | Eric Fiselier <eric@efcs.ca> | 2017-01-17 23:27:56 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2017-01-17 23:27:56 +0000 |
| commit | 8e39559043acf4a24f1f7f321c39b1ad48bd6c08 (patch) | |
| tree | 60ac01add278422c88daab4604baabe29839ee1c /CMakeLists.txt | |
| parent | c8fc92cc09a98fde9087b3270259e4444251a5a2 (diff) | |
Don't strip -m32 from the user provide command line flags. This fixes the compiler-rt 32 bit sanitizer build
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@292291 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index dc7cc467c..59d762976 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -395,7 +395,7 @@ include(HandleLibCXXABI) # Setup the ABI library flags 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=libstdc++) # 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) |