Home My Page Projects Code Snippets Project Openings diderot
Summary Activity Tracker Tasks SCM

SCM Repository

[diderot] Diff of /branches/charisee/src/compiler/c-target/c-target.sml
ViewVC logotype

Diff of /branches/charisee/src/compiler/c-target/c-target.sml

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2489, Mon Oct 21 19:43:32 2013 UTC revision 2490, Mon Oct 21 21:17:25 2013 UTC
# Line 381  Line 381 
381                fun condCons (true, x, xs) = x::xs                fun condCons (true, x, xs) = x::xs
382                  | condCons (false, _, xs) = xs                  | condCons (false, _, xs) = xs
383              (* generate the C compiler flags *)              (* generate the C compiler flags *)
384                val cflags = ["-I" ^ Paths.diderotInclude, "-I" ^ Paths.teemInclude]                val cflags = ["-I" ^ Paths.diderotInclude(), "-I" ^ Paths.teemInclude()]
385                val cflags = condCons (parallel, #pthread Paths.cflags, cflags)                val cflags = condCons (parallel, #pthread Paths.cflags, cflags)
386                val cflags = if debug                val cflags = if debug
387                      then #debug Paths.cflags :: cflags                      then #debug Paths.cflags :: cflags
# Line 389  Line 389 
389                val cflags = #base Paths.cflags :: cflags                val cflags = #base Paths.cflags :: cflags
390              (* generate the loader flags *)              (* generate the loader flags *)
391                val extraLibs = condCons (parallel, #pthread Paths.extraLibs, [])                val extraLibs = condCons (parallel, #pthread Paths.extraLibs, [])
392                val extraLibs = Paths.teemLinkFlags @ #base Paths.extraLibs :: extraLibs                val extraLibs = Paths.teemLinkFlags() @ #base Paths.extraLibs :: extraLibs
393                val rtLib = TargetUtil.runtimeName {                val rtLib = TargetUtil.runtimeName {
394                        target = TargetUtil.TARGET_C,                        target = TargetUtil.TARGET_C,
395                        parallel = parallel, double = double, debug = debug                        parallel = parallel, double = double, debug = debug
# Line 398  Line 398 
398                in                in
399                  genSrc (basename, prog);                  genSrc (basename, prog);
400                  RunCC.compile (basename, cflags);                  RunCC.compile (basename, cflags);
401                  RunCC.link (basename, ldOpts)                  RunCC.linkExec (basename, ldOpts)
402                end                end
403    
404        end        end

Legend:
Removed from v.2489  
changed lines
  Added in v.2490

root@smlnj-gforge.cs.uchicago.edu
ViewVC Help
Powered by ViewVC 1.0.0