[llvm-commits] [compiler-rt] r157608 - /compiler-rt/trunk/lib/asan/asan_rtl.cc

[Alexey Samsonov]

Author: samsonov
Date: Tue May 29 04:39:01 2012
New Revision: 157608

URL: http://llvm.org/viewvc/llvm-project?rev=157608&view=rev
Log:
Fixing ASan build on Win: don't use __asan_default_options

Modified:
    compiler-rt/trunk/lib/asan/asan_rtl.cc

Modified: compiler-rt/trunk/lib/asan/asan_rtl.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_rtl.cc?rev=157608&r1=157607&r2=157608&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_rtl.cc (original)
+++ compiler-rt/trunk/lib/asan/asan_rtl.cc Tue May 29 04:39:01 2012
@@ -500,11 +500,13 @@
   // Make sure we are not statically linked.
   AsanDoesNotSupportStaticLinkage();
 
+#if !defined(_WIN32)
   if (__asan_default_options) {
     Report("Using the defaults from __asan_default_options: %s\n",
            __asan_default_options);
     ParseAsanOptions(__asan_default_options);
   }
+#endif
   // flags
   const char *options = AsanGetEnv("ASAN_OPTIONS");
   ParseAsanOptions(options);