Fix ASAN Builds (#921)

* Do not build libcxx/libcxxabi when building llvm * Update triplets for asan flags * Remove unneeded flags for sanitizers Co-authored-by: Eric Kilmer <[email protected]>
lifting-bits · Mar 26, 2022 · d4dbbe4 · d4dbbe4
1 parent 209a5c5
commit d4dbbe4
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 20 deletions.
diff --git a/ports/llvm-12/vcpkg.json b/ports/llvm-12/vcpkg.json
@@ -20,8 +20,6 @@
     "compiler-rt",
     "default-options",
     "cxx-common-targets",
-    "libcxx",
-    "libcxxabi",
     "mlir",
     "tools",
     "utils"

diff --git a/ports/llvm-13/vcpkg.json b/ports/llvm-13/vcpkg.json
@@ -21,8 +21,6 @@
     "compiler-rt",
     "default-options",
     "cxx-common-targets",
-    "libcxx",
-    "libcxxabi",
     "mlir",
     "tools",
     "utils"

diff --git a/triplets/arm64-osx-asan.cmake b/triplets/arm64-osx-asan.cmake
@@ -8,9 +8,9 @@ set(VCPKG_USE_SANITIZER "Address")
 
 # If the following flags cause errors during build, you might need to manually
 # ignore the PORT and check VCPKG_USE_SANITIZER
-if(NOT PORT MATCHES "^((llvm)|(llvm-[0-9]+)|(upb))$")
-  set(VCPKG_CXX_FLAGS "-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls -ffunction-sections -fdata-sections")
-  set(VCPKG_C_FLAGS "-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls -ffunction-sections -fdata-sections")
+if(NOT PORT MATCHES "^((upb))$")
+  set(VCPKG_CXX_FLAGS "-O1 -g -fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls")
+  set(VCPKG_C_FLAGS "-O1 -g -fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls")
 endif()
 
 # Always apply sanitizer to linker flags

diff --git a/triplets/x64-linux-asan.cmake b/triplets/x64-linux-asan.cmake
@@ -5,12 +5,15 @@ set(VCPKG_LIBRARY_LINKAGE static)
 # ASAN
 # Make sure this value matches up with https://llvm.org/docs/CMake.html "LLVM_USE_SANITIZER"
 set(VCPKG_USE_SANITIZER "Address")
+
 # If the following flags cause errors during build, you might need to manually
 # ignore the PORT and check VCPKG_USE_SANITIZER
-if(NOT PORT MATCHES "^((llvm)|(llvm-[0-9]+)|(upb))$")
-  set(VCPKG_CXX_FLAGS "-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls -ffunction-sections -fdata-sections")
-  set(VCPKG_C_FLAGS "-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls -ffunction-sections -fdata-sections")
-  set(VCPKG_LINKER_FLAGS "-fsanitize=address")
+if(NOT PORT MATCHES "^((upb))$")
+  set(VCPKG_CXX_FLAGS "-O1 -g -fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls")
+  set(VCPKG_C_FLAGS "-O1 -g -fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls")
 endif()
 
+# Always apply sanitizer to linker flags
+set(VCPKG_LINKER_FLAGS "-fsanitize=address")
+
 set(VCPKG_CMAKE_SYSTEM_NAME Linux)
diff --git a/triplets/x64-linux-rel-asan.cmake b/triplets/x64-linux-rel-asan.cmake
@@ -8,9 +8,9 @@ set(VCPKG_USE_SANITIZER "Address")
 
 # If the following flags cause errors during build, you might need to manually
 # ignore the PORT and check VCPKG_USE_SANITIZER
-if(NOT PORT MATCHES "^((llvm)|(llvm-[0-9]+)|(upb))$")
-  set(VCPKG_CXX_FLAGS "-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls -ffunction-sections -fdata-sections")
-  set(VCPKG_C_FLAGS "-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls -ffunction-sections -fdata-sections")
+if(NOT PORT MATCHES "^((upb))$")
+  set(VCPKG_CXX_FLAGS "-fsanitize=address -g -fno-omit-frame-pointer -fno-optimize-sibling-calls")
+  set(VCPKG_C_FLAGS "-fsanitize=address -g -fno-omit-frame-pointer -fno-optimize-sibling-calls")
 endif()
 
 # Always apply sanitizer to linker flags

diff --git a/triplets/x64-osx-asan.cmake b/triplets/x64-osx-asan.cmake
@@ -8,9 +8,9 @@ set(VCPKG_USE_SANITIZER "Address")
 
 # If the following flags cause errors during build, you might need to manually
 # ignore the PORT and check VCPKG_USE_SANITIZER
-if(NOT PORT MATCHES "^((llvm)|(llvm-[0-9]+)|(upb))$")
-  set(VCPKG_CXX_FLAGS "-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls -ffunction-sections -fdata-sections")
-  set(VCPKG_C_FLAGS "-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls -ffunction-sections -fdata-sections")
+if(NOT PORT MATCHES "^((upb))$")
+  set(VCPKG_CXX_FLAGS "-O1 -g -fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls")
+  set(VCPKG_C_FLAGS "-O1 -g -fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls")
   set(VCPKG_LINKER_FLAGS "-fsanitize=address")
 endif()
 

diff --git a/triplets/x64-osx-rel-asan.cmake b/triplets/x64-osx-rel-asan.cmake
@@ -9,9 +9,9 @@ set(VCPKG_USE_SANITIZER "Address")
 
 # If the following flags cause errors during build, you might need to manually
 # ignore the PORT and check VCPKG_USE_SANITIZER
-if(NOT PORT MATCHES "^((llvm)|(llvm-[0-9]+)|(upb))$")
-  set(VCPKG_CXX_FLAGS "-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls -ffunction-sections -fdata-sections")
-  set(VCPKG_C_FLAGS "-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls -ffunction-sections -fdata-sections")
+if(NOT PORT MATCHES "^((upb))$")
+  set(VCPKG_CXX_FLAGS "-fsanitize=address -g -fno-omit-frame-pointer -fno-optimize-sibling-calls")
+  set(VCPKG_C_FLAGS "-fsanitize=address -g -fno-omit-frame-pointer -fno-optimize-sibling-calls")
 endif()
 
 # Always apply sanitizer to linker flags