Merge pull request #2772 from ramarag/fixincrementabuild
authorJan Kotas <jkotas@microsoft.com>
Fri, 22 Jan 2016 05:52:16 +0000 (21:52 -0800)
committerJan Kotas <jkotas@microsoft.com>
Fri, 22 Jan 2016 05:52:16 +0000 (21:52 -0800)
Fix incremental build

1  2 
CMakeLists.txt
build.sh

diff --cc CMakeLists.txt
@@@ -321,9 -332,9 +332,9 @@@ if (CLR_CMAKE_PLATFORM_UNIX
      string(FIND "$ENV{DEBUG_SANITIZERS}" "asan" __ASAN_POS)
      string(FIND "$ENV{DEBUG_SANITIZERS}" "ubsan" __UBSAN_POS)
      if ((${__ASAN_POS} GREATER -1) OR (${__UBSAN_POS} GREATER -1))
 -      set(CLR_SANITIZE_CXX_FLAGS "${CLR_SANITIZE_CXX_FLAGS} -fsanitize=")
 +      set(CLR_SANITIZE_CXX_FLAGS "${CLR_SANITIZE_CXX_FLAGS} -fsanitize-blacklist=${CMAKE_CURRENT_SOURCE_DIR}/sanitizerblacklist.txt -fsanitize=")
        set(CLR_SANITIZE_LINK_FLAGS "${CLR_SANITIZE_LINK_FLAGS} -fsanitize=")
-       if (${__ASAN_POS} GREATER -1) 
+       if (${__ASAN_POS} GREATER -1)
          set(CLR_SANITIZE_CXX_FLAGS "${CLR_SANITIZE_CXX_FLAGS}address,")
          set(CLR_SANITIZE_LINK_FLAGS "${CLR_SANITIZE_LINK_FLAGS}address,")
          message("Address Sanitizer (asan) enabled")
diff --cc build.sh
Simple merge