Check for command-line option dependency AFTER ...

Check for command-line option dependency AFTER all command-line
arguments have been parsed. Avoids unnecessary dependency on the order
of the arguments

3 files changed, 7 insertions, 5 deletions

diff --git a/src/compiler/scala/tools/nsc/CompilerCommand.scala b/src/compiler/scala/tools/nsc/CompilerCommand.scala
index 95b65dadce..25c53cb2b7 100644
--- a/src/compiler/scala/tools/nsc/CompilerCommand.scala
+++ b/src/compiler/scala/tools/nsc/CompilerCommand.scala
@@ -96,8 +96,7 @@ class CompilerCommand(arguments: List[String], val settings: Settings,
           if (args eq args0) {
             error("bad option: '" + args.head + "'")
             ok = false
-          } else
-            ok = settings.checkDependencies
+          }
         }
       } else if ((settings.script.value != "") || args.head.endsWith(fileEnding)) {
         fs = args.head :: fs
@@ -109,6 +108,7 @@ class CompilerCommand(arguments: List[String], val settings: Settings,
         ok = false
       }
     }
+    ok &&= settings.checkDependencies
   }
 
   processArguments()
diff --git a/src/compiler/scala/tools/nsc/symtab/clr/CLRTypes.scala b/src/compiler/scala/tools/nsc/symtab/clr/CLRTypes.scala
index e312c61f3f..d2f75693ea 100644
--- a/src/compiler/scala/tools/nsc/symtab/clr/CLRTypes.scala
+++ b/src/compiler/scala/tools/nsc/symtab/clr/CLRTypes.scala
@@ -195,7 +195,7 @@ abstract class CLRTypes {
       }
     }
     throw new RuntimeException(
-      "cannot find assembly " + name + "; use the -r option to specify its location")
+      "cannot find assembly " + name + "; use the -Xassem-path option to specify its location")
   }
 
   /** Load the rest of the assemblies specified with the '-r' option
diff --git a/test/scalatest b/test/scalatest
index 5b00c33830..f8f4ed7639 100755
--- a/test/scalatest
+++ b/test/scalatest
@@ -298,7 +298,7 @@ test_run_msil() {
     rm -f "$dstbase".$MSIL &&
     rm -f "$dstbase".$EXE &&
 
-    $SCALAC -nowarn -target:msil -Xassem "$os_dstbase" -Xassem-path $assemblies "$@" \
+    $SCALAC -nowarn -Xassem "$os_dstbase" -Xassem-path $assemblies "$@" \
         -sourcepath "$PREFIX/build/msil/src" "$os_srcbase".scala &&
     case "$UNAME" in
         CYGWIN* )
@@ -755,7 +755,9 @@ while [ $# -gt 0 ]; do
     esac;
 done;
 
-if [ "$JAVA5" = "false" -o "$TEST_TYPE" = "msil" ]; then
+if [ "$TEST_TYPE" = "msil" ]; then
+    FLAGS="$FLAGS -target:msil";
+elif [ "$JAVA5" = "false" ]; then
     FLAGS="$FLAGS -target:jvm-1.4";
 fi;