From 44a12879541565a85d4be8b8b25a9c1bb2b858e7 Mon Sep 17 00:00:00 2001 From: NicJA Date: Mon, 1 May 2017 15:40:00 +0000 Subject: [PATCH] fix build and re-enable. git-svn-id: https://svn.aros.org/svn/aros/trunk/contrib@54627 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- gnu/make/mmakefile.src | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/gnu/make/mmakefile.src b/gnu/make/mmakefile.src index d95f49d30..0dddc64c7 100644 --- a/gnu/make/mmakefile.src +++ b/gnu/make/mmakefile.src @@ -22,13 +22,20 @@ include $(SRCDIR)/config/aros-contrib.cfg -##MM- contrib-gnu : contrib-gnu-make +#MM- contrib-gnu : contrib-gnu-make #MM contrib-gnu-make : includes linklibs kernel-aros-linklib TARGETDIR := $(AROS_DEVELOPER)/bin -USER_CFLAGS := -DHAVE_CONFIG_H -D__AROS__ -D_AMIGA \ - -DFILE_TIMESTAMP_HI_RES=0 -DINCLUDEDIR="\".\"" -DLIBDIR="\".\"" -DNO_ARCHIVES -I$(SRCDIR)/$(CURDIR) -I$(SRCDIR)/$(CURDIR)/glob +NOWARN_FLAGS := $(NOWARN_UNUSED_FUNCTION) $(NOWARN_UNUSED_LABEL) \ + $(NOWARN_UNUSED_VARIABLE) $(NOWARN_UNUSED_BUT_SET_VARIABLE) +USER_CFLAGS := $(NOWARN_FLAGS) -DHAVE_CONFIG_H -D__AROS__ -D_AMIGA \ + -DFILE_TIMESTAMP_HI_RES=0 -DINCLUDEDIR="\".\"" -DLIBDIR="\".\"" -DNO_ARCHIVES +USER_INCLUDES := -I$(SRCDIR)/$(CURDIR) -I$(SRCDIR)/$(CURDIR)/glob + +ifneq ("","$(strip $(WARN_ERROR))") +CONFIG_CFLAGS := $(subst $(WARN_ERROR),,$(CONFIG_CFLAGS)) +endif FILES := commands job dir file misc main read remake \ rule implicit default variable expand function \ -- 2.11.4.GIT