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

SCM Repository

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

Diff of /branches/charisee/src/compiler/cl-target/cl-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 793  Line 793 
793                fun condCons (true, x, xs) = x::xs                fun condCons (true, x, xs) = x::xs
794                  | condCons (false, _, xs) = xs                  | condCons (false, _, xs) = xs
795              (* generate the C compiler flags *)              (* generate the C compiler flags *)
796                val cflags = ["-I" ^ Paths.diderotInclude, "-I" ^ Paths.teemInclude]                val cflags = ["-I" ^ Paths.diderotInclude(), "-I" ^ Paths.teemInclude()]
797                val cflags = condCons (#cl Paths.cflags <> "", #cl Paths.cflags, cflags)                val cflags = condCons (#cl Paths.cflags <> "", #cl Paths.cflags, cflags)
798                val cflags = condCons (parallel, #pthread Paths.cflags, cflags)                val cflags = condCons (parallel, #pthread Paths.cflags, cflags)
799                val cflags = if debug                val cflags = if debug
# Line 802  Line 802 
802                val cflags = #base Paths.cflags :: cflags                val cflags = #base Paths.cflags :: cflags
803              (* generate the loader flags *)              (* generate the loader flags *)
804                val extraLibs = condCons (parallel, #pthread Paths.extraLibs, [])                val extraLibs = condCons (parallel, #pthread Paths.extraLibs, [])
805                val extraLibs = Paths.teemLinkFlags @  #base Paths.extraLibs :: extraLibs                val extraLibs = Paths.teemLinkFlags() @  #base Paths.extraLibs :: extraLibs
806                     val extraLibs =  #cl Paths.extraLibs :: extraLibs                     val extraLibs =  #cl Paths.extraLibs :: extraLibs
807                val rtLib = TargetUtil.runtimeName {                val rtLib = TargetUtil.runtimeName {
808                        target = TargetUtil.TARGET_CL,                        target = TargetUtil.TARGET_CL,
# Line 812  Line 812 
812                in                in
813                  genSrc (basename, prog);                  genSrc (basename, prog);
814                  RunCC.compile (basename, cflags);                  RunCC.compile (basename, cflags);
815                  RunCC.link (basename, ldOpts)                  RunCC.linkExec (basename, ldOpts)
816                end                end
817    
818        end (* Program *)        end (* Program *)

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