repositories
/
mTask.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3274f77
)
fix makefiles forgood
author
Mart Lubbers
<mart@martlubbers.net>
Mon, 6 Feb 2017 15:14:16 +0000
(16:14 +0100)
committer
Mart Lubbers
<mart@martlubbers.net>
Mon, 6 Feb 2017 15:14:16 +0000
(16:14 +0100)
CleanSerial
patch
|
blob
|
history
Makefile
patch
|
blob
|
history
diff --git
a/CleanSerial
b/CleanSerial
index
9ccc9f2
..
e883e83
160000
(submodule)
--- a/
CleanSerial
+++ b/
CleanSerial
@@
-1
+1
@@
-Subproject commit
9ccc9f2546625d903b1a92e902ff596fe59e7957
+Subproject commit
e883e832ce7935571b7562623cf78c5a00d31842
diff --git
a/Makefile
b/Makefile
index
9f52e89
..
e6f7f8d
100644
(file)
--- 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\