projects
/
hashcat.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
555e339
)
#245: Makefile DEBUG fix
author
philsmd
<philsmd@hashcat.net>
Sun, 6 Mar 2016 11:03:08 +0000
(12:03 +0100)
committer
philsmd
<philsmd@hashcat.net>
Sun, 6 Mar 2016 11:03:08 +0000
(12:03 +0100)
src/Makefile
patch
|
blob
|
history
diff --git
a/src/Makefile
b/src/Makefile
index
91660d9
..
4f4290d
100644
(file)
--- a/
src/Makefile
+++ b/
src/Makefile
@@
-86,10
+86,17
@@
VERSION_SUM := $(shell git describe --tags --dirty=+ | cut -d- -f3)
## Compiler flags
##
## Compiler flags
##
-CFLAGS := -O2 -pipe -W -Wall -std=c99 -Iinclude/
+CFLAGS := -pipe -W -Wall -std=c99 -Iinclude/
+
+ifndef DEBUG
+CFLAGS += -O2
+else
+CFLAGS += -DDEBUG -g -ggdb
+
+ifeq ($(DEBUG),2)
+CFLAGS += -fsanitize=address -fno-omit-frame-pointer
+endif
-ifeq ($(DEBUG),1)
-CFLAGS += -DDEBUG -g -ggdb -fsanitize=address -fno-omit-frame-pointer
endif
##
endif
##
@@
-114,7
+121,12
@@
endif # darwin
ifeq ($(UNAME),Linux)
CFLAGS_NATIVE := -D_POSIX -DLINUX
ifeq ($(UNAME),Linux)
CFLAGS_NATIVE := -D_POSIX -DLINUX
-CFLAGS_NATIVE += -s $(CFLAGS)
+
+ifndef DEBUG
+CFLAGS_NATIVE += -s
+endif
+
+CFLAGS_NATIVE += $(CFLAGS)
LFLAGS_NATIVE := -lpthread -ldl
LFLAGS_NATIVE := -lpthread -ldl
@@
-137,7
+149,12
@@
endif # linux
##
CFLAGS_CROSS_LINUX := -D_POSIX -DLINUX
##
CFLAGS_CROSS_LINUX := -D_POSIX -DLINUX
-CFLAGS_CROSS_LINUX += -s $(CFLAGS)
+
+ifndef DEBUG
+CFLAGS_CROSS_LINUX += -s
+endif
+
+CFLAGS_CROSS_LINUX += $(CFLAGS)
CFLAGS_CROSS_LINUX += -I$(OPENCL_HEADERS_KHRONOS)/
ifneq (,$(filter 1,$(WITH_ADL) $(WITH_NVML)))
CFLAGS_CROSS_LINUX += -I$(OPENCL_HEADERS_KHRONOS)/
ifneq (,$(filter 1,$(WITH_ADL) $(WITH_NVML)))
@@
-153,7
+170,12
@@
endif
endif
CFLAGS_CROSS_WIN := -D_WIN -DWIN -D__MSVCRT__ -D__USE_MINGW_ANSI_STDIO=1
endif
CFLAGS_CROSS_WIN := -D_WIN -DWIN -D__MSVCRT__ -D__USE_MINGW_ANSI_STDIO=1
-CFLAGS_CROSS_WIN += -s $(filter-out -fsanitize=address,$(CFLAGS))
+
+ifndef DEBUG
+CFLAGS_CROSS_WIN += -s
+endif
+
+CFLAGS_CROSS_WIN += $(filter-out -fsanitize=address,$(CFLAGS))
CFLAGS_CROSS_WIN += -I$(OPENCL_HEADERS_KHRONOS)/
ifneq (,$(filter 1,$(WITH_ADL) $(WITH_NVAPI)))
CFLAGS_CROSS_WIN += -I$(OPENCL_HEADERS_KHRONOS)/
ifneq (,$(filter 1,$(WITH_ADL) $(WITH_NVAPI)))