From 6b200ea70ff023790b9d4d1b0ca3bd47c0e7e46b Mon Sep 17 00:00:00 2001
From: Camil Staps
Date: Mon, 24 Jul 2017 17:06:42 +0200
Subject: Update for gcc 6

---
 Makefile | 1 +
 sil.icl  | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 5291f81..a9a1741 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 BIN:=sil
 CLM:=clm
 CLMFLAGS:=-nt -nr\
+	-l -no-pie\
 	-I $$CLEAN_HOME/lib/Generics\
 	-I $$CLEAN_HOME/lib/Platform\
 	-I ABCMachine
diff --git a/sil.icl b/sil.icl
index 32195e7..789db86 100644
--- a/sil.icl
+++ b/sil.icl
@@ -97,7 +97,7 @@ Start w
 # (_,w) = fclose f w
 | not args.generate
 	= finish 0 io err w
-# (p,w) = callProcess "/opt/clean/bin/clm" ["sil_compiled", "-o", "sil_compiled"] Nothing w
+# (p,w) = callProcess "/opt/clean/bin/clm" ["-l", "-no-pie", "sil_compiled", "-o", "sil_compiled"] Nothing w
 | isError p
 	# err = err <<< snd (fromError p) <<< "\r\n"
 	= finish 1 io err w
@@ -121,7 +121,7 @@ where
 		)
 
 	isFilename :: (String -> Bool)
-	isFilename = all (\c -> isAlphanum c || isMember c ['./']) o fromString
+	isFilename = all (\c -> isAlphanum c || isMember c ['./-']) o fromString
 
 	finish :: !Int !*File !*File !*World -> *World
 	finish ret io err w
-- 
cgit v1.2.3