summaryrefslogtreecommitdiff
path: root/src/compiler.sml
diff options
context:
space:
mode:
authorGravatar Adam Chlipala <adamc@hcoop.net>2009-05-31 13:43:02 -0400
committerGravatar Adam Chlipala <adamc@hcoop.net>2009-05-31 13:43:02 -0400
commit004aab09629c2bb54b31ea86fddae1b288df27b2 (patch)
tree51ecf2038eca9a8eed5601a561c0510ebba247c7 /src/compiler.sml
parenta6424094365f7d63b6c9dade8f8f72ef26e92b45 (diff)
Fix pathmap bug; expose lower-level heap manipulation from C
Diffstat (limited to 'src/compiler.sml')
-rw-r--r--src/compiler.sml5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/compiler.sml b/src/compiler.sml
index b0dfe387..fb5ed0e0 100644
--- a/src/compiler.sml
+++ b/src/compiler.sml
@@ -413,7 +413,7 @@ fun parseUrp' fname =
sources = #sources new @ #sources old
}
in
- foldr (fn (fname, job) => merge (job, parseUrp' fname)) job (!libs)
+ foldr (fn (fname, job) => merge (job, pu fname)) job (!libs)
end
fun parsePkind s =
@@ -876,7 +876,8 @@ fun compileC {cname, oname, ename, libs, profile, debug, link = link'} =
val urweb_o = clibFile "urweb.o"
val driver_o = clibFile "driver.o"
- val compile = "gcc " ^ Config.gccArgs ^ " -Wstrict-prototypes -Werror -O3 -I include -c " ^ cname ^ " -o " ^ oname
+ 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 ^ " " ^ driver_o ^ " -o " ^ ename
val (compile, link) =