From: Marek Safar <marek.safar@gmail.com>
Date: Tue, 22 Feb 2011 16:46:54 +0000 (+0000)
Subject: Remove some weird and unused MONO_PATH acrobatics
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=bfbfdf16a21975f86901a8d266bf79e6436e8aa0;p=mono.git

Remove some weird and unused MONO_PATH acrobatics
---

diff --git a/mcs/class/System/Microsoft.CSharp/CSharpCodeCompiler.cs b/mcs/class/System/Microsoft.CSharp/CSharpCodeCompiler.cs
index 4c4c943023f..9b5cb86a53a 100644
--- a/mcs/class/System/Microsoft.CSharp/CSharpCodeCompiler.cs
+++ b/mcs/class/System/Microsoft.CSharp/CSharpCodeCompiler.cs
@@ -78,9 +78,9 @@ namespace Mono.CSharp
 				if (!File.Exists (windowsMonoPath))
 					throw new FileNotFoundException ("Windows mono path not found: " + windowsMonoPath);
 
-				windowsMcsPath = Path.Combine (p, "2.0\\mcs.exe");
+				windowsMcsPath = Path.Combine (p, "4.0\\mcs.exe");
 				if (!File.Exists (windowsMcsPath))
-					windowsMcsPath = Path.Combine(Path.GetDirectoryName (p), "lib\\basic\\mcs.exe");
+					windowsMcsPath = Path.Combine(Path.GetDirectoryName (p), "lib\\build\\mcs.exe");
 				
 				if (!File.Exists (windowsMcsPath))
 					throw new FileNotFoundException ("Windows mcs path not found: " + windowsMcsPath);
@@ -178,7 +178,7 @@ namespace Mono.CSharp
 
 			mcsOutput = new StringCollection ();
 			mcsOutMutex = new Mutex ();
-
+/*
 			string monoPath = Environment.GetEnvironmentVariable ("MONO_PATH");
 			if (monoPath == null)
 				monoPath = String.Empty;
@@ -194,7 +194,7 @@ namespace Mono.CSharp
 				else
 					dict.Add ("MONO_PATH", monoPath);
 			}
-			
+*/
 			mcs.StartInfo.CreateNoWindow=true;
 			mcs.StartInfo.UseShellExecute=false;
 			mcs.StartInfo.RedirectStandardOutput=true;