[MLton-commit] r5661

[Matthew Fluet]

Print source files relative to SML_LIB
----------------------------------------------------------------------

U   mlton/trunk/bin/mlton-script
U   mlton/trunk/mlton/control/source-pos.sml

----------------------------------------------------------------------

Modified: mlton/trunk/bin/mlton-script
===================================================================
--- mlton/trunk/bin/mlton-script	2007-06-20 15:22:04 UTC (rev 5660)
+++ mlton/trunk/bin/mlton-script	2007-06-20 23:04:22 UTC (rev 5661)
@@ -110,5 +110,5 @@
                 '-Wl,-R/usr/pkg/lib -L/usr/pkg/lib/'             \
         -target-link-opt openbsd '-L/usr/local/lib/'             \
         -target-link-opt solaris '-lnsl -lsocket -lrt'           \
-        -profile-exclude '<basis>'                               \
+        -profile-exclude '\$\(SML_LIB\)'                         \
         "$@"

Modified: mlton/trunk/mlton/control/source-pos.sml
===================================================================
--- mlton/trunk/mlton/control/source-pos.sml	2007-06-20 15:22:04 UTC (rev 5660)
+++ mlton/trunk/mlton/control/source-pos.sml	2007-06-20 23:04:22 UTC (rev 5661)
@@ -53,11 +53,7 @@
          case getLib p of
             NONE => file
           | SOME i =>
-               String.substituteFirst
-               (String.substituteFirst
-                (String.dropPrefix (file, i),
-                 {substring = "/", replacement = "<"}),
-                {substring = "/", replacement = ">/"})
+               concat ["$(SML_LIB)", String.dropPrefix (file, i)]
 
 val bogus = T {column = ~1,
                file = "<bogus>",