Make *mcs compiler aliases differ in sdk version only

diff --git a/mcs/mcs/ikvm.cs b/mcs/mcs/ikvm.cs
index d641234f80bcba9abee7648b206eac83567cbc82..f048f0cb9b63d7d1c5aa6fb0df9c8c83367560a8 100644 (file)
--- a/mcs/mcs/ikvm.cs
+++ b/mcs/mcs/ikvm.cs
@@ -428,7 +428,7 @@ namespace Mono.CSharp
 
                                        var a = domain.LoadFile (file);
                                        if (a != null) {
-                                               loaded_names.Add (Tuple.Create (a.GetName (), assembly));
+                                               loaded_names.Add (Tuple.Create (a.GetName (), file));
                                        }
 
                                        return a;

diff --git a/scripts/dmcs.in b/scripts/dmcs.in
index a1008f65ab11fb3b0d2e169f841694227065c0c1..9660c902341a79744f7c6d897f56baab8963a4df 100644 (file)
--- a/scripts/dmcs.in
+++ b/scripts/dmcs.in
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec @bindir@/mono $MONO_OPTIONS @mono_instdir@/2.0/mcs.exe -lib:@mono_instdir@/4.0 "$@"
+exec @bindir@/mono $MONO_OPTIONS @mono_instdir@/2.0/mcs.exe -sdk:4 "$@"

diff --git a/scripts/mcs.in b/scripts/mcs.in
index 32498fa4278f96ae8529f76dacf6b12fe055ee4a..a48c529b90400ae0fdc3811f32615551bf067dd5 100644 (file)
--- a/scripts/mcs.in
+++ b/scripts/mcs.in
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec @bindir@/mono $MONO_OPTIONS @mono_instdir@/2.0/mcs.exe -lib:@mono_instdir@/2.0 -lib:@mono_instdir@/3.5 "$@"
+exec @bindir@/mono $MONO_OPTIONS @mono_instdir@/2.0/mcs.exe -sdk:2 "$@"