diff options
| author |  Adam Chlipala <adamc@hcoop.net> | 2008-10-19 12:47:10 -0400 |
|---|---|---|
| committer | Adam Chlipala <adamc@hcoop.net> | 2008-10-19 12:47:10 -0400 |
| commit | 54d7cbad02005212c4171b7d652416c75a93aa37 (patch) | |
| tree | a51f905aff94143b7019859ff0407d1935e177f9 /src/compiler.sml | |
| parent | 8476261d4f4a9a67119abc05cb40907ad979b4de (diff) | |
Proper configuration and installation
Diffstat (limited to 'src/compiler.sml')
| -rw-r--r-- | src/compiler.sml | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/compiler.sml b/src/compiler.sml index 26aede96..c413715a 100644 --- a/src/compiler.sml +++ b/src/compiler.sml @@ -355,11 +355,16 @@ val parse = { val toParse = transform parse "parse" o toParseJob +fun libFile s = OS.Path.joinDirFile {dir = Config.libUr, + file = s} +fun clibFile s = OS.Path.joinDirFile {dir = Config.libC, + file = s} + val elaborate = { func = fn file => let - val basis = #func parseUrs "lib/basis.urs" - val topSgn = #func parseUrs "lib/top.urs" - val topStr = #func parseUr "lib/top.ur" + val basis = #func parseUrs (libFile "basis.urs") + val topSgn = #func parseUrs (libFile "top.urs") + val topStr = #func parseUr (libFile "top.ur") in Elaborate.elabFile basis topStr topSgn ElabEnv.empty file end, @@ -493,8 +498,11 @@ val toSqlify = transform sqlify "sqlify" o toMono_opt2 fun compileC {cname, oname, ename} = let + val urweb_o = clibFile "urweb.o" + val driver_o = clibFile "driver.o" + val compile = "gcc -Wstrict-prototypes -Werror -O3 -I include -c " ^ cname ^ " -o " ^ oname - val link = "gcc -Werror -O3 -pthread -lpq clib/urweb.o " ^ oname ^ " clib/driver.o -o " ^ ename + val link = "gcc -Werror -O3 -pthread -lpq " ^ urweb_o ^ " " ^ oname ^ " " ^ driver_o ^ " -o " ^ ename in if not (OS.Process.isSuccess (OS.Process.system compile)) then print "C compilation failed\n" @@ -517,6 +525,7 @@ fun compile job = else let val dir = OS.FileSys.tmpName () + val () = OS.FileSys.remove dir val cname = OS.Path.joinDirFile {dir = dir, file = "urweb.c"} val oname = OS.Path.joinDirFile {dir = dir, file = "urweb.o"} in |