From 610dc28a6c858748c6a22ce4478eeaef66477514 Mon Sep 17 00:00:00 2001
From: Adam Chlipala <adam@chlipala.net>
Date: Sat, 16 Jan 2016 09:33:39 -0500
Subject: Tweaking discovery of Pthreads C flags

---
 src/compiler.sml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/compiler.sml b/src/compiler.sml
index e2dc168e..e269c8b9 100644
--- a/src/compiler.sml
+++ b/src/compiler.sml
@@ -1520,7 +1520,16 @@ fun compileC {cname, oname, ename, libs, profile, debug, linker, link = link'} =
                       ^ " " ^ #compile proto
                       ^ " -c " ^ escapeFilename cname ^ " -o " ^ escapeFilename oname
 
-        val linker = Option.getOpt (linker, (Settings.getCCompiler ()) ^ " -Werror" ^ opt ^ " " ^ Config.ccArgs ^ " " ^ Config.pthreadLibs)
+        fun concatArgs (a1, a2) =
+            if CharVector.all Char.isSpace a1 then
+                a2
+            else
+                a1 ^ " " ^ a2
+
+        val args = concatArgs (Config.ccArgs, Config.pthreadCflags)
+        val args = concatArgs (args, Config.pthreadLibs)
+
+        val linker = Option.getOpt (linker, (Settings.getCCompiler ()) ^ " -Werror" ^ opt ^ " " ^ args)
 
         val ssl = if Settings.getStaticLinking () then
                       Config.openssl ^ " -ldl -lz"
-- 
cgit v1.2.3