From 1cbe656d6629acfe7c0b29bf111de1a0736a408f Mon Sep 17 00:00:00 2001 From: Alexey Samsonov Date: Tue, 29 May 2012 09:39:01 +0000 Subject: [PATCH] Fixing ASan build on Win: don't use __asan_default_options llvm-svn: 157608 --- compiler-rt/lib/asan/asan_rtl.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compiler-rt/lib/asan/asan_rtl.cc b/compiler-rt/lib/asan/asan_rtl.cc index 7884d13..bcdbf24 100644 --- a/compiler-rt/lib/asan/asan_rtl.cc +++ b/compiler-rt/lib/asan/asan_rtl.cc @@ -500,11 +500,13 @@ void __asan_init() { // 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); -- 2.7.4