comparison src/main.mlton.sml @ 1983:0ff4f64b4309

Merge in upstream
author Patrick Hurst <phurst@mit.edu>
date Wed, 29 Jan 2014 18:29:43 -0500
parents 0652f295e0fa
children 210fb3dfc483
comparison
equal deleted inserted replaced
1982:2b95ecdd94eb 1983:0ff4f64b4309
130 | "-sql" :: s :: rest => 130 | "-sql" :: s :: rest =>
131 (Settings.setSql (SOME s); 131 (Settings.setSql (SOME s);
132 doArgs rest) 132 doArgs rest)
133 | "-static" :: rest => 133 | "-static" :: rest =>
134 (Settings.setStaticLinking true; 134 (Settings.setStaticLinking true;
135 doArgs rest)
136 | "-stop" :: phase :: rest =>
137 (Compiler.setStop phase;
135 doArgs rest) 138 doArgs rest)
136 | "-path" :: name :: path :: rest => 139 | "-path" :: name :: path :: rest =>
137 (Compiler.addPath (name, path); 140 (Compiler.addPath (name, path);
138 doArgs rest) 141 doArgs rest)
139 | "-root" :: name :: root :: rest => 142 | "-root" :: name :: root :: rest =>