projects
/
platform
/
upstream
/
llvm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
084d8f7
)
Fixing ASan build on Win: don't use __asan_default_options
author
Alexey Samsonov
<samsonov@google.com>
Tue, 29 May 2012 09:39:01 +0000
(09:39 +0000)
committer
Alexey Samsonov
<samsonov@google.com>
Tue, 29 May 2012 09:39:01 +0000
(09:39 +0000)
llvm-svn: 157608
compiler-rt/lib/asan/asan_rtl.cc
patch
|
blob
|
history
diff --git
a/compiler-rt/lib/asan/asan_rtl.cc
b/compiler-rt/lib/asan/asan_rtl.cc
index
7884d13
..
bcdbf24
100644
(file)
--- 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);