diff options
| author |  Adam Chlipala <adam@chlipala.net> | 2016-01-16 09:33:39 -0500 |
|---|---|---|
| committer | Adam Chlipala <adam@chlipala.net> | 2016-01-16 09:33:39 -0500 |
| commit | 610dc28a6c858748c6a22ce4478eeaef66477514 (patch) | |
| tree | 58470b0e06f254a547e58896dd07bf272e0c312a /src/compiler.sml | |
| parent | d47ffbc86c1cafb041588ab0ea7540c538196cb9 (diff) | |
Tweaking discovery of Pthreads C flags
Diffstat (limited to 'src/compiler.sml')
| -rw-r--r-- | src/compiler.sml | 11 |
1 files changed, 10 insertions, 1 deletions
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" |