[PATCH] D24809: [libcxx] [cmake] Strip possibly-inherited compiler flags in in-tree build only

[Michał Górny via cfe-commits]

mgorny retitled this revision from "[libcxx] [cmake] Stop stripping -m32 from compiler flags" to "[libcxx] [cmake] Strip possibly-inherited compiler flags in in-tree build only".
mgorny updated the summary for this revision.
mgorny added a reviewer: beanz.
mgorny updated this revision to Diff 72602.
mgorny added a comment.

Updated the patch to affect only stand-alone builds. Adding @beanz since he seems to have worked on out-of-tree LLVM build support.


https://reviews.llvm.org/D24809

Files:
  CMakeLists.txt

Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -307,9 +307,11 @@
 
 include(HandleLibCXXABI) # Setup the ABI library flags
 
-# Remove flags that may have snuck in.
-remove_flags(-DNDEBUG -UNDEBUG -D_DEBUG
-             -stdlib=libc++ -stdlib=libstdc++ -lc++abi -m32)
+if (LIBCXX_STANDALONE_BUILD)
+  # Remove flags that may have snuck in.
+  remove_flags(-DNDEBUG -UNDEBUG -D_DEBUG
+               -stdlib=libc++ -stdlib=libstdc++ -lc++abi -m32)
+endif()
 
 # FIXME(EricWF): See the FIXME on LIBCXX_ENABLE_PEDANTIC.
 # Remove the -pedantic flag and -Wno-pedantic and -pedantic-errors


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D24809.72602.patch
Type: text/x-patch
Size: 669 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20160927/a3335505/attachment.bin>