From b8de42160912569977f1ae2fb5df496119d9e44a Mon Sep 17 00:00:00 2001
From: Isaiah Norton <isaiah.norton@gmail.com>
Date: Wed, 14 May 2014 01:14:38 -0400
Subject: [PATCH] Makefile: DEBUG -> JL_DEBUG_BUILD to avoid LLVM conflict

---
 Make.inc        |  4 ++--
 Windows.inc     |  2 +-
 src/Windows.mk  |  2 +-
 src/codegen.cpp | 12 ++++++------
 src/jlapi.c     |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Make.inc b/Make.inc
index c1a1997dc410e..45b38d2fbe354 100644
--- a/Make.inc
+++ b/Make.inc
@@ -218,7 +218,7 @@ CXX = $(CROSS_COMPILE)g++
 JCFLAGS = -std=gnu99 -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
 JCPPFLAGS =
 JCXXFLAGS = -pipe $(fPIC) -fno-rtti
-DEBUGFLAGS = -O0 -ggdb3 -DDEBUG -fstack-protector-all
+DEBUGFLAGS = -O0 -ggdb3 -DJL_DEBUG_BUILD -fstack-protector-all
 SHIPFLAGS = -O3 -falign-functions
 endif
 
@@ -228,7 +228,7 @@ CXX = $(CROSS_COMPILE)clang++
 JCFLAGS = -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
 JCPPFLAGS =
 JCXXFLAGS = -pipe $(fPIC) -fno-rtti
-DEBUGFLAGS = -O0 -g -DDEBUG -fstack-protector-all
+DEBUGFLAGS = -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all
 SHIPFLAGS = -O3
 ifeq ($(OS), Darwin)
 ifeq ($(USE_LIBCPP), 1)
diff --git a/Windows.inc b/Windows.inc
index 9356b7467a381..eaec850b89eb4 100644
--- a/Windows.inc
+++ b/Windows.inc
@@ -51,7 +51,7 @@ CFLAGS = $(CFLAGS) /D_X86_=1
 CFLAGS = $(CFLAGS) /D_AMD64_=1 /DWIN64 /D_WIN64
 !endif
 
-!ifdef DEBUG
+!ifdef JL_DEBUG_BUILD
 CFLAGS = $(CFLAGS) /Zi /Od /DDEBUG /MDd
 LFLAGS = $(LFLAGS) /DEBUG
 !else
diff --git a/src/Windows.mk b/src/Windows.mk
index 0bb192a3e0bd3..b6c8e8dde0467 100644
--- a/src/Windows.mk
+++ b/src/Windows.mk
@@ -40,7 +40,7 @@ LIBUV = ..\deps\libuv\libuv.lib
 FLISP = flisp\flisp.exe
 
 INCLUDE = $(INCLUDE);$(MAKEDIR)\..\deps\libuv\include;$(MAKEDIR)\flisp;$(MAKEDIR)\support;C:\Program Files\llvm\include
-!ifdef DEBUG
+!ifdef JL_DEBUG_BUILD
 LIB = $(LIB);C:\Program Files\llvm\lib\Debug
 !else
 LIB = $(LIB);C:\Program Files\llvm\lib\Release
diff --git a/src/codegen.cpp b/src/codegen.cpp
index 60908341cfc03..8d1ec21afd6e4 100644
--- a/src/codegen.cpp
+++ b/src/codegen.cpp
@@ -97,7 +97,7 @@
 #include "llvm/Support/FormattedStream.h"
 #include "llvm/Support/DynamicLibrary.h"
 #include "llvm/Config/llvm-config.h"
-#ifdef DEBUG
+#ifdef JL_DEBUG_BUILD
 #include "llvm/Support/CommandLine.h"
 #endif
 #include "llvm/Transforms/Utils/Cloning.h"
@@ -507,7 +507,7 @@ static Function *to_function(jl_lambda_info_t *li, bool cstyle)
     }
     assert(f != NULL);
     nested_compile = last_n_c;
-#ifdef DEBUG
+#ifdef JL_DEBUG_BUILD
 #ifdef LLVM35
     llvm::raw_fd_ostream out(1,false);
 #endif
@@ -3246,7 +3246,7 @@ static Function *emit_function(jl_lambda_info_t *lam, bool cstyle)
             AttributeSet::FunctionIndex,*attr));
 #endif
 #endif
-#ifdef DEBUG
+#ifdef JL_DEBUG_BUILD
 #if LLVM32 && !LLVM33
     f->addFnAttr(Attributes::StackProtectReq);
 #else
@@ -4208,7 +4208,7 @@ static void init_julia_llvm_env(Module *m)
 
 extern "C" void jl_init_codegen(void)
 {
-#ifdef DEBUG
+#ifdef JL_DEBUG_BUILD
     cl::ParseEnvironmentOptions("Julia", "JULIA_LLVM_ARGS");
 #endif
     imaging_mode = jl_compileropts.build_path != NULL;
@@ -4237,7 +4237,7 @@ extern "C" void jl_init_codegen(void)
 
 #if !defined(LLVM_VERSION_MAJOR) || (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR == 0)
     jl_ExecutionEngine = EngineBuilder(m).setEngineKind(EngineKind::JIT).create();
-#ifdef DEBUG
+#ifdef JL_DEBUG_BUILD
     llvm::JITEmitDebugInfo = true;
 #endif
     //llvm::JITEmitDebugInfoToDisk = true;
@@ -4249,7 +4249,7 @@ extern "C" void jl_init_codegen(void)
 #elif LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 1
     TargetOptions options = TargetOptions();
     //options.PrintMachineCode = true; //Print machine code produced during JIT compiling
-#ifdef DEBUG
+#ifdef JL_DEBUG_BUILD
     options.JITEmitDebugInfo = true;
 #endif 
     options.NoFramePointerElim = true;
diff --git a/src/jlapi.c b/src/jlapi.c
index 347552335919f..39106ab6c06d6 100644
--- a/src/jlapi.c
+++ b/src/jlapi.c
@@ -266,7 +266,7 @@ DLLEXPORT void jl_sigatomic_end(void)
 
 DLLEXPORT int jl_is_debugbuild(void)
 {
-#ifdef DEBUG
+#ifdef JL_DEBUG_BUILD
     return 1;
 #else
     return 0;