From: anthraxx Date: Mon, 4 Jul 2016 19:01:51 +0000 (+0200) Subject: extend global CFLAGS and LDFLAGS to aid distro packaging X-Git-Url: https://www.flypig.org.uk/git/?p=hashcat.git;a=commitdiff_plain;h=7f8aaf74302816d03fbff62dab5c987d498acdde extend global CFLAGS and LDFLAGS to aid distro packaging This preserves globally defined CFLAGS and LDFLAGS and simply extends those variables to aid distro based packaging toolchains and predefined distro wide defaults like SSP, relro etc. --- diff --git a/src/Makefile b/src/Makefile index 9f11325..cf44590 100644 --- a/src/Makefile +++ b/src/Makefile @@ -90,7 +90,7 @@ VERSION_TAG := $(shell test -d .git && git describe --tags --dirty= ## Compiler flags ## -CFLAGS := -pipe -W -Wall -std=c99 -Iinclude/ -IOpenCL/ -I$(OPENCL_HEADERS_KHRONOS)/ +CFLAGS += -pipe -W -Wall -std=c99 -Iinclude/ -IOpenCL/ -I$(OPENCL_HEADERS_KHRONOS)/ ifndef DEBUG CFLAGS += -O2 @@ -112,6 +112,7 @@ export MACOSX_DEPLOYMENT_TARGET=10.9 CFLAGS_NATIVE := -D_POSIX -DDARWIN CFLAGS_NATIVE += $(CFLAGS) LFLAGS_NATIVE := -lpthread +LFLAGS_NATIVE += $(LDFLAGS) endif # darwin ifeq ($(UNAME),Linux) @@ -122,6 +123,7 @@ endif CFLAGS_NATIVE += $(CFLAGS) LFLAGS_NATIVE := -lpthread -ldl CFLAGS_NATIVE += -DHAVE_HWMON +LFLAGS_NATIVE += $(LDFLAGS) endif # linux ##