Move /FS to SANITIZER_COMMON_CFLAGS

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@200485 91177308-0d34-0410-b5e6-96231b3b80d8
rust-lang · Jan 30, 2014 · d2328a7 · d2328a7
1 parent c9726c5
commit d2328a7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -148,8 +148,10 @@ else()
   set(SANITIZER_COMMON_CFLAGS
     /MT
     /Zi
+    /FS
     /Oy-
     /GS-
+    /wd4221
     /wd4722
     )
 endif()

diff --git a/lib/asan/CMakeLists.txt b/lib/asan/CMakeLists.txt
@@ -31,7 +31,7 @@ if (NOT MSVC)
 else()
   set(ASAN_CFLAGS
     ${SANITIZER_COMMON_CFLAGS}
-    /GR- /FS)
+    /GR-)
 endif()
 
 set(ASAN_COMMON_DEFINITIONS

diff --git a/lib/interception/CMakeLists.txt b/lib/interception/CMakeLists.txt
@@ -16,7 +16,7 @@ if (NOT MSVC)
 else()
   set(INTERCEPTION_CFLAGS
     ${SANITIZER_COMMON_CFLAGS}
-    /GR- /FS)
+    /GR-)
 endif()
 
 if(APPLE)

diff --git a/lib/sanitizer_common/CMakeLists.txt b/lib/sanitizer_common/CMakeLists.txt
@@ -94,7 +94,7 @@ if (NOT MSVC)
 else()
   set(SANITIZER_CFLAGS
     ${SANITIZER_COMMON_CFLAGS}
-    /GR- /FS)
+    /GR-)
 endif()
 
 if(SUPPORTS_GLOBAL_CONSTRUCTORS_FLAG)
-Original file line number
+Diff line change
@@ Expand Up / @@ -148,8 +148,10 @@ else() @@
       set(SANITIZER_COMMON_CFLAGS
         /MT
         /Zi
+        /FS
         /Oy-
         /GS-
+        /wd4221
         /wd4722
         )
     endif()
@@ Expand Down @@