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

SCM Repository

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

Diff of /branches/vis12/src/compiler/cl-target/cl-target.sml

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

revision 2429, Wed Sep 18 20:05:57 2013 UTC revision 2430, Thu Sep 19 21:41:27 2013 UTC
# Line 847  Line 847 
847                fun condCons (true, x, xs) = x::xs                fun condCons (true, x, xs) = x::xs
848                  | condCons (false, _, xs) = xs                  | condCons (false, _, xs) = xs
849              (* generate the C compiler flags *)              (* generate the C compiler flags *)
850                val cflags = ["-I" ^ Paths.diderotInclude, "-I" ^ Paths.teemInclude]                val cflags = ["-I" ^ Paths.diderotInclude, "-I" ^ Paths.teemInclude()]
851                val cflags = condCons (#cl Paths.cflags <> "", #cl Paths.cflags, cflags)                val cflags = condCons (#cl Paths.cflags <> "", #cl Paths.cflags, cflags)
852                val cflags = condCons (parallel, #pthread Paths.cflags, cflags)                val cflags = condCons (parallel, #pthread Paths.cflags, cflags)
853                val cflags = if debug                val cflags = if debug
# Line 856  Line 856 
856                val cflags = #base Paths.cflags :: cflags                val cflags = #base Paths.cflags :: cflags
857              (* generate the loader flags *)              (* generate the loader flags *)
858                val extraLibs = condCons (parallel, #pthread Paths.extraLibs, [])                val extraLibs = condCons (parallel, #pthread Paths.extraLibs, [])
859                val extraLibs = Paths.teemLinkFlags @  #base Paths.extraLibs :: extraLibs                val extraLibs = Paths.teemLinkFlags() @  #base Paths.extraLibs :: extraLibs
860                     val extraLibs =  #cl Paths.extraLibs :: extraLibs                     val extraLibs =  #cl Paths.extraLibs :: extraLibs
861                val rtLib = Properties.runtimeName props                val rtLib = Properties.runtimeName props
862                val ldOpts = rtLib :: extraLibs                val ldOpts = rtLib :: extraLibs

Legend:
Removed from v.2429  
changed lines
  Added in v.2430

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