diff options
| author | Mitch Phillips <mitchphillips@outlook.com> | 2019-05-17 20:34:37 +0000 |
|---|---|---|
| committer | Mitch Phillips <mitchphillips@outlook.com> | 2019-05-17 20:34:37 +0000 |
| commit | 4d008addf6cc869b3a452f751584a3a8148094af (patch) | |
| tree | 62d94f77524c63033718adc8f61a78e7a52ce135 /lib/gwp_asan | |
| parent | 168d74df4ce90b6734f2ff0e5bd7422ae2bd998b (diff) | |
| download | compiler-rt-4d008addf6cc869b3a452f751584a3a8148094af.tar.gz | |
Explicitly remove -stdlib=libc++, as we pass -nostdinc++ anyway. This should fix the android builtbots, and is a direct copy from what Scudo does.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@361073 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/gwp_asan')
| -rw-r--r-- | lib/gwp_asan/CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/gwp_asan/CMakeLists.txt b/lib/gwp_asan/CMakeLists.txt index 3b1a2b7f8..1f6d973b3 100644 --- a/lib/gwp_asan/CMakeLists.txt +++ b/lib/gwp_asan/CMakeLists.txt @@ -15,6 +15,9 @@ set(GWP_ASAN_HEADERS # parts of the C++ standard library. set(GWP_ASAN_CFLAGS -fno-rtti -fno-exceptions -nostdinc++) +# Remove -stdlib= which is unused when passing -nostdinc++. +string(REGEX REPLACE "-stdlib=[a-zA-Z+]*" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) + if (COMPILER_RT_HAS_GWP_ASAN) foreach(arch ${GWP_ASAN_SUPPORTED_ARCH}) add_compiler_rt_runtime( |