[MLton-commit] r4152

Stephen Weeks MLton@mlton.org
Fri, 4 Nov 2005 12:49:48 -0800


Moved hardwired reference to build/lib/mlb-path-map from the front end
SML code into bin/mlton-script.

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

U   mlton/trunk/bin/mlton-script
U   mlton/trunk/mlton/front-end/mlb-front-end.fun

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

Modified: mlton/trunk/bin/mlton-script
===================================================================
--- mlton/trunk/bin/mlton-script	2005-11-04 20:48:41 UTC (rev 4151)
+++ mlton/trunk/bin/mlton-script	2005-11-04 20:49:46 UTC (rev 4152)
@@ -68,6 +68,7 @@
         -cc-opt "-I$lib/include"                                \
         -cc-opt '-O1'                                           \
         -cc-opt '-fno-strict-aliasing -fomit-frame-pointer -w'  \
+	-mlb-path-map "$lib/mlb-path-map"			\
         -target-as-opt amd64                                    \
                 '-m32
                 -mtune=opteron'                                 \

Modified: mlton/trunk/mlton/front-end/mlb-front-end.fun
===================================================================
--- mlton/trunk/mlton/front-end/mlb-front-end.fun	2005-11-04 20:48:41 UTC (rev 4151)
+++ mlton/trunk/mlton/front-end/mlb-front-end.fun	2005-11-04 20:49:46 UTC (rev 4152)
@@ -100,10 +100,7 @@
          val pathMap =
             List.rev
             (List.concat
-             [List.concat
-              (List.map (concat [!Control.libDir, "/mlb-path-map"]
-                         :: (!Control.mlbPathMaps),
-                         make)),
+             [List.concat (List.map (!Control.mlbPathMaps, make)),
               [{var = "LIB_MLTON_DIR", 
                 path = !Control.libDir},
                {var = "TARGET_ARCH",