From d56b5cc38ef1ccf66f9a9fe2ce52fce82c8b71f3 Mon Sep 17 00:00:00 2001 From: Martin Nowak Date: Sat, 27 Jan 2018 10:16:48 +0100 Subject: [PATCH] allow to configure DFLAGS and WARNINGS - e.g. to test dlang/tools without erroring on deprecations (ci.dlang.org) - use `override DFLAGS +=` for non-configurable target specific flags --- posix.mak | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/posix.mak b/posix.mak index 073b2e66fd..49d31dc0a6 100644 --- a/posix.mak +++ b/posix.mak @@ -31,10 +31,12 @@ ifeq (,$(findstring win,$(OS))) PHOBOSSO = $(PHOBOS_PATH)/generated/$(OS)/release/$(MODEL)/libphobos2.so endif +# default to warnings and deprecations as errors, override via e.g. make -f posix.mak WARNINGS=-wi +WARNINGS = -w -de # default include/link paths, override by setting DFLAGS (e.g. make -f posix.mak DFLAGS=-I/foo) DFLAGS = -I$(DRUNTIME_PATH)/import -I$(PHOBOS_PATH) \ - -L-L$(PHOBOS_PATH)/generated/$(OS)/release/$(MODEL) $(MODEL_FLAG) -DFLAGS += -w -de -fPIC + -L-L$(PHOBOS_PATH)/generated/$(OS)/release/$(MODEL) $(MODEL_FLAG) -fPIC +DFLAGS += $(WARNINGS) # Default DUB flags (DUB uses a different architecture format) DUBFLAGS = --arch=$(subst 32,x86,$(subst 64,x86_64,$(MODEL))) @@ -84,7 +86,7 @@ d-tags.json: @exit 1 $(ROOT)/dman: d-tags.json -$(ROOT)/dman: DFLAGS += -J. +$(ROOT)/dman: override DFLAGS += -J. install: $(TOOLS) $(CURL_TOOLS) $(ROOT)/dustmite mkdir -p $(INSTALL_DIR)/bin