forked from OSchip/llvm-project
[sanitizer] Fix for CMAKE_CXX_FLAGS update
With unquoted ${CMAKE_CXX_FLAGS}, the REGEX fails when it's empty: ```CMake Error at lib/scudo/standalone/CMakeLists.txt:14 (string): string sub-command REGEX, mode REPLACE needs at least 6 arguments total to command.```
This commit is contained in:
parent
aeee014428
commit
68ab571e22
|
@ -39,7 +39,7 @@ append_list_if(COMPILER_RT_HAS_FPIC_FLAG -fPIC GWP_ASAN_CFLAGS)
|
||||||
# append_list_if(COMPILER_RT_HAS_SANITIZER_COMMON ${SANITIZER_COMMON_CFLAGS} GWP_ASAN_CFLAGS)
|
# append_list_if(COMPILER_RT_HAS_SANITIZER_COMMON ${SANITIZER_COMMON_CFLAGS} GWP_ASAN_CFLAGS)
|
||||||
|
|
||||||
# Remove -stdlib= which is unused when passing -nostdinc++.
|
# Remove -stdlib= which is unused when passing -nostdinc++.
|
||||||
string(REGEX REPLACE "-stdlib=[a-zA-Z+]*" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
|
string(REGEX REPLACE "-stdlib=[a-zA-Z+]*" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
|
||||||
|
|
||||||
# Options parsing support is optional. This is an optional library that can be
|
# Options parsing support is optional. This is an optional library that can be
|
||||||
# used by an allocator to automatically parse GwpAsan options from the
|
# used by an allocator to automatically parse GwpAsan options from the
|
||||||
|
|
|
@ -113,7 +113,7 @@ endif()
|
||||||
# We don't use the C++ Standard Library here, so avoid including it by mistake.
|
# We don't use the C++ Standard Library here, so avoid including it by mistake.
|
||||||
append_list_if(COMPILER_RT_HAS_NOSTDINCXX_FLAG -nostdinc++ EXTRA_FLAGS)
|
append_list_if(COMPILER_RT_HAS_NOSTDINCXX_FLAG -nostdinc++ EXTRA_FLAGS)
|
||||||
# XRay uses C++ standard library headers.
|
# XRay uses C++ standard library headers.
|
||||||
string(REGEX REPLACE "-stdlib=[a-zA-Z+]*" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
|
string(REGEX REPLACE "-stdlib=[a-zA-Z+]*" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
|
||||||
|
|
||||||
# This appears to be a C-only warning banning the use of locals in aggregate
|
# This appears to be a C-only warning banning the use of locals in aggregate
|
||||||
# initializers. All other compilers accept this, though.
|
# initializers. All other compilers accept this, though.
|
||||||
|
|
|
@ -11,7 +11,7 @@ list(APPEND SCUDO_CFLAGS
|
||||||
-nostdinc++)
|
-nostdinc++)
|
||||||
|
|
||||||
# Remove -stdlib= which is unused when passing -nostdinc++.
|
# Remove -stdlib= which is unused when passing -nostdinc++.
|
||||||
string(REGEX REPLACE "-stdlib=[a-zA-Z+]*" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
|
string(REGEX REPLACE "-stdlib=[a-zA-Z+]*" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
|
||||||
|
|
||||||
append_list_if(COMPILER_RT_HAS_FVISIBILITY_HIDDEN_FLAG -fvisibility=hidden SCUDO_CFLAGS)
|
append_list_if(COMPILER_RT_HAS_FVISIBILITY_HIDDEN_FLAG -fvisibility=hidden SCUDO_CFLAGS)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue