From 2e207d4d76dfc9c3b9e1d039df4f27bd9ca30076 Mon Sep 17 00:00:00 2001 From: Mitch Phillips Date: Tue, 4 Jun 2019 19:18:40 +0000 Subject: [PATCH] Fixed GWP-ASan build breakage. When adding the optional flag parser, there was a missing dependency on compiler-rt (and thus SanitizerCommon) for this feature. llvm-svn: 362542 --- compiler-rt/cmake/config-ix.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compiler-rt/cmake/config-ix.cmake b/compiler-rt/cmake/config-ix.cmake index 67aec6f..49a22a9 100644 --- a/compiler-rt/cmake/config-ix.cmake +++ b/compiler-rt/cmake/config-ix.cmake @@ -687,7 +687,8 @@ endif() # Note: Fuchsia and Windows are not currently supported by GWP-ASan. Support # is planned for these platforms. Darwin is also not supported due to TLS # calling malloc on first use. -if (GWP_ASAN_SUPPORTED_ARCH AND OS_NAME MATCHES "Android|Linux") +if (COMPILER_RT_HAS_SANITIZER_COMMON AND GWP_ASAN_SUPPORTED_ARCH AND + OS_NAME MATCHES "Android|Linux") set(COMPILER_RT_HAS_GWP_ASAN TRUE) else() set(COMPILER_RT_HAS_GWP_ASAN FALSE) -- 2.7.4