diff options
author | Stephen Hines <srhines@google.com> | 2012-05-03 14:47:20 -0700 |
---|---|---|
committer | Stephen Hines <srhines@google.com> | 2012-05-03 14:47:20 -0700 |
commit | fd6aea25184fd0735922461b88f059ee547844c3 (patch) | |
tree | 09de2d7914a6a404d4d32f9d8434ccb091ae62bb | |
parent | 0bf048c82b95f4e0b3227d275a347436197cff7f (diff) | |
download | external_llvm-fd6aea25184fd0735922461b88f059ee547844c3.zip external_llvm-fd6aea25184fd0735922461b88f059ee547844c3.tar.gz external_llvm-fd6aea25184fd0735922461b88f059ee547844c3.tar.bz2 |
Fix assert handling for LLVM.
If we undefined NDEBUG first, the system-wide -DNDEBUG will override it, thus
causing asserts to still remain off.
Change-Id: I84342ca36595bbd7e310ea19c6907938fba4cee7
-rw-r--r-- | llvm-device-build.mk | 4 | ||||
-rw-r--r-- | llvm-host-build.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/llvm-device-build.mk b/llvm-device-build.mk index 156a39b..30baec0 100644 --- a/llvm-device-build.mk +++ b/llvm-device-build.mk @@ -27,9 +27,9 @@ endif ifeq ($(LLVM_ENABLE_ASSERTION),true) LOCAL_CFLAGS := \ + $(LOCAL_CFLAGS) \ -D_DEBUG \ - -UNDEBUG \ - $(LOCAL_CFLAGS) + -UNDEBUG endif ifneq ($(REQUIRES_EH),1) diff --git a/llvm-host-build.mk b/llvm-host-build.mk index 67c3808..9fd7435 100644 --- a/llvm-host-build.mk +++ b/llvm-host-build.mk @@ -13,9 +13,9 @@ LOCAL_CFLAGS := \ ifeq ($(LLVM_ENABLE_ASSERTION),true) LOCAL_CFLAGS := \ + $(LOCAL_CFLAGS) \ -D_DEBUG \ - -UNDEBUG \ - $(LOCAL_CFLAGS) + -UNDEBUG endif ifneq ($(REQUIRES_EH),1) |