--- a/src/compiler.sml	Sun Apr 22 09:18:21 2012 -0400
+++ b/src/compiler.sml	Sun Apr 22 10:57:22 2012 -0400
@@ -44,6 +44,7 @@
      timeout : int,
      ffi : string list,
      link : string list,
+     linker : string option,
      headers : string list,
      scripts : string list,
      clientToServer : Settings.ffi list,
@@ -399,6 +400,7 @@
                        timeout = 60,
                        ffi = [],
                        link = [],
+                       linker = NONE,
                        headers = [],
                        scripts = [],
                        clientToServer = [],
@@ -518,6 +520,7 @@
                     val timeout = ref NONE
                     val ffi = ref []
                     val link = ref []
+                    val linker = ref NONE
                     val headers = ref []
                     val scripts = ref []
                     val clientToServer = ref []
@@ -552,6 +555,7 @@
                                 timeout = Option.getOpt (!timeout, 60),
                                 ffi = rev (!ffi),
                                 link = rev (!link),
+                                linker = !linker,
                                 headers = rev (!headers),
                                 scripts = rev (!scripts),
                                 clientToServer = rev (!clientToServer),
@@ -607,6 +611,7 @@
                                 timeout = #timeout old,
                                 ffi = #ffi old @ #ffi new,
                                 link = #link old @ #link new,
+                                linker = mergeO (fn (_, new) => new) (#linker old, #linker new),
                                 headers = #headers old @ #headers new,
                                 scripts = #scripts old @ #scripts new,
                                 clientToServer = #clientToServer old @ #clientToServer new,
@@ -742,6 +747,7 @@
                                     in
                                         link := arg :: !link
                                     end
+                                  | "linker" => linker := SOME arg
                                   | "include" => headers := relifyA arg :: !headers
                                   | "script" => scripts := arg :: !scripts
                                   | "clientToServer" => clientToServer := ffiS () :: !clientToServer
@@ -1356,7 +1362,7 @@
 
 val beforeC = ref (fn () => ())
 
-fun compileC {cname, oname, ename, libs, profile, debug, link = link'} =
+fun compileC {cname, oname, ename, libs, profile, debug, linker, link = link'} =
     let
         val proto = Settings.currentProtocol ()
 
@@ -1375,7 +1381,9 @@
                       ^ " " ^ #compile proto
                       ^ " -c " ^ escapeFilename cname ^ " -o " ^ escapeFilename oname
 
-        val link = Config.ccompiler ^ " -Werror" ^ opt ^ " " ^ Config.ccArgs ^ " " ^ Config.pthreadCflags ^ " " ^ Config.pthreadLibs
+        val linker = Option.getOpt (linker, Config.ccompiler ^ " -Werror" ^ opt ^ " " ^ Config.ccArgs ^ " " ^ Config.pthreadCflags ^ " " ^ Config.pthreadLibs)
+
+        val link = linker
                    ^ " " ^ lib ^ " " ^ escapeFilename oname ^ " " ^ libs ^ " -lm " ^ Config.openssl ^ " -o " ^ escapeFilename ename
 
         val (compile, link) =
@@ -1462,7 +1470,7 @@
                          end;
 
                      compileC {cname = cname, oname = oname, ename = ename, libs = libs,
-                               profile = #profile job, debug = #debug job, link = #link job}
+                               profile = #profile job, debug = #debug job, linker = #linker job, link = #link job}
                      
                      before cleanup ())
             end