Commit ff04e643 authored by Rich Prohaska's avatar Rich Prohaska Committed by Yoni Fogel

imp make DEBUG=0 or DEBUG=1. closes #1272

git-svn-id: file:///svn/toku/tokudb.1032b@8075 c7de825b-a66e-492c-adef-691d508d4ae1
parent 269e95e4
...@@ -41,6 +41,8 @@ ...@@ -41,6 +41,8 @@
# To make warnings be warnngs instead of errors do # To make warnings be warnngs instead of errors do
# make WERROR= # make WERROR=
DEBUG = 0
.DELETE_ON_ERROR: .DELETE_ON_ERROR:
ifneq ($(GCOV),) ifneq ($(GCOV),)
...@@ -186,10 +188,10 @@ ifneq ($(CYGWIN),) ...@@ -186,10 +188,10 @@ ifneq ($(CYGWIN),)
ifeq ($(CC),icc) ifeq ($(CC),icc)
#Cygwin icc only #Cygwin icc only
ifeq ($(CRUNTIME),) ifeq ($(CRUNTIME),)
ifneq ($(DEBUG),) ifeq ($(DEBUG),0)
CRUNTIME=MDd
else
CRUNTIME=MD CRUNTIME=MD
else
CRUNTIME=MDd
endif endif
endif endif
ALWAYS_LINK=$(LIBPORTABILITY) $(TOKUROOT)windows/lib/$(CRUNTIME)/zlib.lib Ws2_32.lib psapi.lib ALWAYS_LINK=$(LIBPORTABILITY) $(TOKUROOT)windows/lib/$(CRUNTIME)/zlib.lib Ws2_32.lib psapi.lib
...@@ -229,12 +231,12 @@ ifneq ($(CYGWIN),) ...@@ -229,12 +231,12 @@ ifneq ($(CYGWIN),)
endif endif
endif endif
ifneq ($(DEBUG),) ifeq ($(DEBUG),0)
OPTFLAGS = $(DBG_OPTFLAGS)
ARFLAGS = $(DBG_ARFLAGS)
else
OPTFLAGS = $(OPT_OPTFLAGS) OPTFLAGS = $(OPT_OPTFLAGS)
ARFLAGS = $(OPT_ARFLAGS) ARFLAGS = $(OPT_ARFLAGS)
else
OPTFLAGS = $(DBG_OPTFLAGS)
ARFLAGS = $(DBG_ARFLAGS)
endif endif
CFLAGS = $(WALL) $(W64) $(WERROR) $(FORMAT) $(VISIBILITY) $(FPICFLAGS) $(SHADOW) CFLAGS = $(WALL) $(W64) $(WERROR) $(FORMAT) $(VISIBILITY) $(FPICFLAGS) $(SHADOW)
...@@ -356,7 +358,7 @@ EXPORTMAP = -Wl,--version-script=$(EXPORTMAPFILE) ...@@ -356,7 +358,7 @@ EXPORTMAP = -Wl,--version-script=$(EXPORTMAPFILE)
SHARED=-shared SHARED=-shared
endif endif
ifeq ($(SOEXT),dll) ifeq ($(SOEXT),dll)
ifeq ($(DEBUG),) ifeq ($(DEBUG),0)
SHARED=/LD SHARED=/LD
else else
SHARED=/LDd SHARED=/LDd
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment