Mercurial > urweb
diff src/compiler.sml @ 1368:b2bc8bcd546f
Switch from libmhash to OpenSSL
| author | Adam Chlipala <adam@chlipala.net> |
|---|---|
| date | Sun, 26 Dec 2010 11:13:37 -0500 |
| parents | fd34210bc3e5 |
| children | bf58ca871c00 |
line wrap: on
line diff
--- a/src/compiler.sml Sat Dec 25 08:58:25 2010 -0500 +++ b/src/compiler.sml Sun Dec 26 11:13:37 2010 -0500 @@ -1285,16 +1285,16 @@ let val proto = Settings.currentProtocol () - val (lib, mhash) = if Settings.getStaticLinking () then - (#linkStatic proto ^ " " ^ Config.lib ^ "/../liburweb.a", Config.libMhash ^ "/libmhash.a") - else - ("-L" ^ Config.lib ^ "/.. -lurweb " ^ #linkDynamic proto, "-L" ^ Config.libMhash ^ " -lmhash") + val lib = if Settings.getStaticLinking () then + #linkStatic proto ^ " " ^ Config.lib ^ "/../liburweb.a" + else + "-L" ^ Config.lib ^ "/.. -lurweb " ^ #linkDynamic proto val compile = "gcc " ^ Config.gccArgs ^ " -Wimplicit -Werror -O3 -fno-inline -I " ^ Config.includ ^ " " ^ #compile proto ^ " -c " ^ cname ^ " -o " ^ oname - val link = "gcc -Werror -O3 -lm -lcrypt -pthread " ^ Config.gccArgs ^ " " ^ libs ^ " " ^ lib ^ " " ^ mhash ^ " " ^ oname + val link = "gcc -Werror -O3 -lm -lcrypt -pthread " ^ Config.gccArgs ^ " " ^ libs ^ " " ^ lib ^ " " ^ Config.openssl ^ " " ^ oname ^ " -o " ^ ename val (compile, link) =