diff options
author | 2012-01-05 19:23:34 -0500 | |
---|---|---|
committer | 2012-01-05 19:23:34 -0500 | |
commit | 6fc9942712fcdd6cdd5b138e619191c8c3972bee (patch) | |
tree | 616430c12cc382a66560653ac06c92e6e9ef71af | |
parent | 2637c1c722ae2be270c214b1893156f555a10883 (diff) |
Change linking argument order, based on reported problems in Ubuntu 11.10
-rw-r--r-- | src/compiler.sml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler.sml b/src/compiler.sml index 2a890f32..57c3e1ff 100644 --- a/src/compiler.sml +++ b/src/compiler.sml @@ -1354,7 +1354,7 @@ fun compileC {cname, oname, ename, libs, profile, debug, link = link'} = 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 @@ fun compileC {cname, oname, ename, libs, profile, debug, link = link'} = ^ " " ^ #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 |