LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't strip -m32 from the user provide command line flags. This fixes the compiler-rt 32 bit sanitizer build

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@292291 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier
2017-01-17 23:27:56 +00:00
parent c8fc92cc09
commit 8e39559043
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -395,7 +395,7 @@ include(HandleLibCXXABI) # Setup the ABI library flags
if (NOT LIBCXX_STANDALONE_BUILD) if (NOT LIBCXX_STANDALONE_BUILD)
# Remove flags that may have snuck in. # Remove flags that may have snuck in.
remove_flags(-DNDEBUG -UNDEBUG -D_DEBUG remove_flags(-DNDEBUG -UNDEBUG -D_DEBUG
-lc++abi -m32) -lc++abi)
endif() endif()
remove_flags(-stdlib=libc++ -stdlib=libstdc++) remove_flags(-stdlib=libc++ -stdlib=libstdc++)
@@ -404,7 +404,7 @@ remove_flags(-stdlib=libc++ -stdlib=libstdc++)
# non-debug DLLs # non-debug DLLs
remove_flags("/D_DEBUG" "/MTd" "/MDd" "/MT" "/Md") 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 # Remove the -pedantic flag and -Wno-pedantic and -pedantic-errors
# so they don't get transformed into -Wno and -errors respectivly. # so they don't get transformed into -Wno and -errors respectivly.
remove_flags(-Wno-pedantic -pedantic-errors -pedantic) remove_flags(-Wno-pedantic -pedantic-errors -pedantic)