Mercurial > urweb
diff src/compiler.sml @ 1659:8de2ea0a0701
Change linking argument order, based on reported problems in Ubuntu 11.10
| author | Adam Chlipala <adam@chlipala.net> |
|---|---|
| date | Thu, 05 Jan 2012 19:23:34 -0500 |
| parents | e374b6b8ab38 |
| children | 3cfc79f92db7 |
line wrap: on
line diff
--- a/src/compiler.sml Thu Jan 05 19:13:31 2012 -0500 +++ b/src/compiler.sml Thu Jan 05 19:23:34 2012 -0500 @@ -1354,7 +1354,7 @@ val lib = if Settings.getStaticLinking () then #linkStatic proto ^ " " ^ Config.lib ^ "/../liburweb.a" else - "-L" ^ Config.lib ^ "/.. -lurweb " ^ #linkDynamic proto + "-L" ^ Config.lib ^ "/.. " ^ #linkDynamic proto ^ " -lurweb" val opt = if debug then "" @@ -1366,8 +1366,8 @@ ^ " " ^ #compile proto ^ " -c " ^ escapeFilename cname ^ " -o " ^ escapeFilename oname - val link = Config.ccompiler ^ " -Werror" ^ opt ^ " -lm " ^ Config.ccArgs ^ " " ^ Config.pthreadCflags ^ " " ^ Config.pthreadLibs - ^ " " ^ lib ^ " " ^ Config.openssl ^ " " ^ escapeFilename oname ^ " -o " ^ escapeFilename ename ^ " " ^ libs + val link = Config.ccompiler ^ " -Werror" ^ opt ^ " " ^ Config.ccArgs ^ " " ^ Config.pthreadCflags ^ " " ^ Config.pthreadLibs + ^ " " ^ lib ^ " " ^ escapeFilename oname ^ " " ^ libs ^ " -lm " ^ Config.openssl ^ " -o " ^ escapeFilename ename val (compile, link) = if profile then