diff --git a/cmake/platform_unix.cmake b/cmake/platform_unix.cmake
index aae286622..260481467 100644
--- a/cmake/platform_unix.cmake
+++ b/cmake/platform_unix.cmake
@@ -51,7 +51,7 @@ function(setup_litecore_build_unix)
     endif()
 
 
-    if (LITECORE_SANITIZE AND NOT CODE_COVERAGE_ENABLED AND (CMAKE_CXX_COMPILER_ID MATCHES Clang))
+    if (LITECORE_SANITIZE AND NOT CODE_COVERAGE_ENABLED AND (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU"))
         set(LITECORE_COMPILE_OPTIONS
             -fstack-protector
             -fsanitize=address
@@ -67,6 +67,11 @@ function(setup_litecore_build_unix)
                 -fsanitize=address
                 -fsanitize=undefined
             )
+#            if (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+#                target_link_options(${target} PRIVATE
+#                    -static-libasan
+#                )
+#            endif ()
         endforeach ()
     else()
         set(LITECORE_COMPILE_OPTIONS
@@ -105,7 +110,7 @@ function(setup_litecore_build_unix)
     )
 
     if(LITECORE_WARNINGS_HARDCORE)
-        if (CMAKE_CXX_COMPILER_ID MATCHES Clang)
+        if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
             set(LITECORE_CXX_WARNINGS
                 -Werror
                 -Weverything            # "WARN ALL THE THINGS!!!"