diff options
| author | Sean Callanan <scallanan@apple.com> | 2011-10-26 17:46:51 +0000 |
|---|---|---|
| committer | Sean Callanan <scallanan@apple.com> | 2011-10-26 17:46:51 +0000 |
| commit | 3b1d4f678522905d3b8c596da49db78fd48b28f1 (patch) | |
| tree | 702ade325132cae7429260864533969fac31628c | |
| parent | 90c49c037e3334c9a1545e13377ca228a9d80bbb (diff) | |
| download | bcm5719-llvm-3b1d4f678522905d3b8c596da49db78fd48b28f1.tar.gz bcm5719-llvm-3b1d4f678522905d3b8c596da49db78fd48b28f1.zip | |
Added a new #define, LLVM_NDEBUG_OFF, that should
be set if linking against an LLVM compiled with
NDEBUG off. If it is set, we do not enable NDEBUG
in any place where we include LLVM headers.
llvm-svn: 143036
| -rw-r--r-- | lldb/include/lldb/Symbol/ClangExternalASTSourceCallbacks.h | 2 | ||||
| -rw-r--r-- | lldb/source/Symbol/ClangASTContext.cpp | 2 | ||||
| -rw-r--r-- | lldb/source/Symbol/ClangExternalASTSourceCallbacks.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lldb/include/lldb/Symbol/ClangExternalASTSourceCallbacks.h b/lldb/include/lldb/Symbol/ClangExternalASTSourceCallbacks.h index c76b9eb1119..2ab6dc27864 100644 --- a/lldb/include/lldb/Symbol/ClangExternalASTSourceCallbacks.h +++ b/lldb/include/lldb/Symbol/ClangExternalASTSourceCallbacks.h @@ -29,7 +29,7 @@ // file. So we have to define NDEBUG when including clang headers to avoid any // mismatches. This is covered by rdar://problem/8691220 -#ifndef NDEBUG +#if !defined(NDEBUG) && !defined(LLVM_NDEBUG_OFF) #define LLDB_DEFINED_NDEBUG_FOR_CLANG #define NDEBUG // Need to include assert.h so it is as clang would expect it to be (disabled) diff --git a/lldb/source/Symbol/ClangASTContext.cpp b/lldb/source/Symbol/ClangASTContext.cpp index 827470f429c..8e7e4f6c54b 100644 --- a/lldb/source/Symbol/ClangASTContext.cpp +++ b/lldb/source/Symbol/ClangASTContext.cpp @@ -25,7 +25,7 @@ // file. So we have to define NDEBUG when including clang headers to avoid any // mismatches. This is covered by rdar://problem/8691220 -#ifndef NDEBUG +#if !defined(NDEBUG) && !defined(LLVM_NDEBUG_OFF) #define LLDB_DEFINED_NDEBUG_FOR_CLANG #define NDEBUG // Need to include assert.h so it is as clang would expect it to be (disabled) diff --git a/lldb/source/Symbol/ClangExternalASTSourceCallbacks.cpp b/lldb/source/Symbol/ClangExternalASTSourceCallbacks.cpp index 5b7b48fa901..04c85798ebf 100644 --- a/lldb/source/Symbol/ClangExternalASTSourceCallbacks.cpp +++ b/lldb/source/Symbol/ClangExternalASTSourceCallbacks.cpp @@ -23,7 +23,7 @@ // file. So we have to define NDEBUG when including clang headers to avoid any // mismatches. This is covered by rdar://problem/8691220 -#ifndef NDEBUG +#if !defined(NDEBUG) && !defined(LLVM_NDEBUG_OFF) #define LLDB_DEFINED_NDEBUG_FOR_CLANG #define NDEBUG // Need to include assert.h so it is as clang would expect it to be (disabled) |
