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

SCM Repository

[diderot] Diff of /trunk/src/compiler/common/paths_sml.in
ViewVC logotype

Diff of /trunk/src/compiler/common/paths_sml.in

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

revision 1231, Mon May 16 13:49:17 2011 UTC revision 1232, Mon May 16 23:37:52 2011 UTC
# Line 15  Line 15 
15      in      in
16    (* directories for Diderot stuff *)    (* directories for Diderot stuff *)
17      val diderotBin = "@DIDEROT_ROOT@" // "bin"      val diderotBin = "@DIDEROT_ROOT@" // "bin"
18      val diderotInclude = "@DIDEROT_ROOT@" // "src/include"      val diderotLib = "@DIDEROT_ROOT@" // "lib"
19      val diderotSrc = "@DIDEROT_ROOT@" // "src"      val diderotSrc = "@DIDEROT_ROOT@" // "src"
20      val diderotLib = diderotSrc // "lib"      val diderotInclude = diderotSrc // "include"
21    
22    (* directories for Teem stuff *)    (* directories for Teem stuff *)
23      val teemBin = "@TEEM_DIR@" // "bin"      val teemBin = "@TEEM_DIR@" // "bin"
# Line 64  Line 64 
64            in            in
65              String.concatWith " " (cmd::args)              String.concatWith " " (cmd::args)
66            end            end
67      val cflags = "@CFLAGS@ @PTHREAD_CFLAGS@"      val cflags = {
68      val extraLibs = "@PTHREAD_LIBS@ @LIBM@"              base = "@CFLAGS_BASE@",
69                pthread = "@PTHREAD_CFLAGS@",
70                debug = "-g -O0",
71    (*          ndebug = "-march=native -O3 -DNDEBUG" *)  (* gcc complains about -march=native, even though the man page says it is supported *)
72                ndebug = "-O3 -DNDEBUG"
73              }
74        val extraLibs = {
75                base = "@LIBM@",
76                pthread = "@PTHREAD_LIBS@",
77                cl = "@CL_LIBS@"
78              }
79      end (* local *)      end (* local *)
80    
81      (* other configuration options *)
82        val clEnabled = @CL_ENABLED@
83        val clVersion = if clEnabled
84              then let
85                val major = @CL_VERSION@ div 10000
86                val minor = (@CL_VERSION@ div 100) mod 100
87                val patch = @CL_VERSION@ mod 100
88                in
89                  if patch > 0 then [major, minor, patch] else [major, minor]
90                end
91              else []
92        val cudaEnabled = @CUDA_ENABLED@
93      end (* local *)      end (* local *)
94    
95    end    end

Legend:
Removed from v.1231  
changed lines
  Added in v.1232

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