From 8c06af6123389e9f4a2302e08230b1e5aaadb590 Mon Sep 17 00:00:00 2001 From: Adam Chlipala Date: Sun, 31 May 2009 13:43:02 -0400 Subject: Fix pathmap bug; expose lower-level heap manipulation from C --- src/compiler.sml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/compiler.sml') 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) = -- cgit v1.2.3