From: Mart Lubbers Date: Mon, 6 Feb 2017 15:14:16 +0000 (+0100) Subject: fix makefiles forgood X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;ds=sidebyside;h=9f47008270ad2ab66d7787eb29b0f83a82a8e42e;p=mTask.git fix makefiles forgood --- diff --git a/CleanSerial b/CleanSerial index 9ccc9f2..e883e83 160000 --- a/CleanSerial +++ b/CleanSerial @@ -1 +1 @@ -Subproject commit 9ccc9f2546625d903b1a92e902ff596fe59e7957 +Subproject commit e883e832ce7935571b7562623cf78c5a00d31842 diff --git a/Makefile b/Makefile index 9f52e89..e6f7f8d 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,12 @@ CLEAN_HOME?=/opt/clean CLM:=clm -override CLMFLAGS+=-dynamics -h 200M -nt -l -no-pie + +override CLMFLAGS+=-dynamics -h 200M -nt +GCCVERSIONGTEQ6:=$(shell expr `gcc -dumpversion | cut -f1 -d.` \>= 6) +ifeq "$(GCCVERSIONGTEQ6)" "1" + override CLMFLAGS+=-l -no-pie +endif + CLMLIBS:=\ -I $(CLEAN_HOME)/lib/Platform\ -I $(CLEAN_HOME)/lib/Platform/Deprecated/StdLib\