diff options
| author |  Eran Meir <eranmeir@gmail.com> | 2016-01-02 03:49:39 +0200 |
|---|---|---|
| committer | Eran Meir <eranmeir@gmail.com> | 2016-01-02 03:49:39 +0200 |
| commit | 8f8bca7350c25d21e079e3513d9b8fad93c42812 (patch) | |
| tree | b1fae1440bcbb4e3edcf1a78391cd3e34de5c669 /src | |
| parent | c748c02510ce84b457c2c7d288a67b686642bd0d (diff) | |
Prevent pthread cflags options from being passed to linker
(in order to fix build issue on mac)
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler.sml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler.sml b/src/compiler.sml index bf7491e5..5ac024d4 100644 --- a/src/compiler.sml +++ b/src/compiler.sml @@ -878,7 +878,7 @@ fun parseUrp' accLibs fname = | "jsFile" => (Settings.setFilePath thisPath; Settings.addJsFile arg) - + | _ => ErrorMsg.error ("Unrecognized command '" ^ cmd ^ "'"); read () end @@ -1518,7 +1518,7 @@ 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.pthreadCflags ^ " " ^ Config.pthreadLibs) + val linker = Option.getOpt (linker, (Settings.getCCompiler ()) ^ " -Werror" ^ opt ^ " " ^ Config.ccArgs ^ " " ^ Config.pthreadLibs) val ssl = if Settings.getStaticLinking () then Config.openssl ^ " -ldl -lz" |