summaryrefslogtreecommitdiff
path: root/src/compiler.sml
diff options
context:
space:
mode:
authorGravatar Adam Chlipala <adamc@hcoop.net>2009-06-23 15:56:04 -0400
committerGravatar Adam Chlipala <adamc@hcoop.net>2009-06-23 15:56:04 -0400
commita4717bf85434747f0e96aa11030ce0869db2706c (patch)
tree5c08087fd98403edb3500ac4399ddece25c667ad /src/compiler.sml
parentca88628fbeb6fe8cadf9d7e12e5faccf2a7da96b (diff)
Initial implementation of protocols in Settings
Diffstat (limited to 'src/compiler.sml')
-rw-r--r--src/compiler.sml5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/compiler.sml b/src/compiler.sml
index c7c2f65e..6126a1a2 100644
--- a/src/compiler.sml
+++ b/src/compiler.sml
@@ -883,14 +883,13 @@ val toSqlify = transform sqlify "sqlify" o toMono_opt2
fun compileC {cname, oname, ename, libs, profile, debug, link = link'} =
let
+ val proto = Settings.currentProtocol ()
val urweb_o = clibFile "urweb.o"
- val request_o = clibFile "request.o"
- val driver_o = clibFile "driver.o"
val compile = "gcc " ^ Config.gccArgs ^ " -Wstrict-prototypes -Werror -O3 -I " ^ Config.includ
^ " -c " ^ cname ^ " -o " ^ oname
val link = "gcc -Werror -O3 -lm -lmhash -pthread " ^ libs ^ " " ^ urweb_o ^ " " ^ oname
- ^ " " ^ request_o ^ " " ^ driver_o ^ " -o " ^ ename
+ ^ " " ^ #link proto ^ " -o " ^ ename
val (compile, link) =
if profile then