diff options
| author |  Adam Chlipala <adam@chlipala.net> | 2010-12-26 11:13:37 -0500 |
|---|---|---|
| committer | Adam Chlipala <adam@chlipala.net> | 2010-12-26 11:13:37 -0500 |
| commit | bc7000ce141d30e4db4842edd8fa067ac1ec191d (patch) | |
| tree | d59424249e21ce243abae8ec042deb0fdeccb3d7 /src/compiler.sml | |
| parent | a090c56aad2934d397d23df2a7b17156b12695a1 (diff) | |
Switch from libmhash to OpenSSL
Diffstat (limited to 'src/compiler.sml')
| -rw-r--r-- | src/compiler.sml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/compiler.sml b/src/compiler.sml index 0c0a527f..0668ac42 100644 --- a/src/compiler.sml +++ b/src/compiler.sml @@ -1285,16 +1285,16 @@ fun compileC {cname, oname, ename, libs, profile, debug, link = link'} = 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) = |