From: Jens Steube Date: Tue, 5 Jul 2016 07:22:36 +0000 (+0200) Subject: Merge pull request #415 from anthraxx/master X-Git-Url: https://www.flypig.org.uk/git/?a=commitdiff_plain;h=69e3e3956825895b642b4651a3ddc744a95ca26e;hp=dc9696bc3f3243dcdeb7ce9cf4d743c64178fa8f;p=hashcat.git Merge pull request #415 from anthraxx/master extend global CFLAGS and LDFLAGS to aid distro packaging --- 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 ##