diff options
| author | Lluis Sanchez <lluis@novell.com> | 2009-11-09 20:45:50 +0300 |
|---|---|---|
| committer | Lluis Sanchez <lluis@novell.com> | 2009-11-09 20:45:50 +0300 |
| commit | 6e8b6625f49b1a276947361aeafdeaf1fcd8a8c5 (patch) | |
| tree | ecf32364d7def62d4d637f990be09cbfe001248c /main/src/addins/ILAsmBinding/ILAsmCompilerManager.cs | |
| parent | 35c791de05a0489666c4d3d27ad213647dacef70 (diff) | |
* ILAsmCompilerManager.cs: Get the ilasm path using the target
runtime. Should fix bug #553536 - IL Console project completely
broken on windows.
svn path=/trunk/monodevelop/; revision=145754
Diffstat (limited to 'main/src/addins/ILAsmBinding/ILAsmCompilerManager.cs')
| -rw-r--r-- | main/src/addins/ILAsmBinding/ILAsmCompilerManager.cs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/main/src/addins/ILAsmBinding/ILAsmCompilerManager.cs b/main/src/addins/ILAsmBinding/ILAsmCompilerManager.cs index a4ad767d66..5fecddac94 100644 --- a/main/src/addins/ILAsmBinding/ILAsmCompilerManager.cs +++ b/main/src/addins/ILAsmBinding/ILAsmCompilerManager.cs @@ -87,8 +87,8 @@ namespace ILAsmBinding string output = ""; string error = ""; - - string outstr = "ilasm " + sb.ToString (); + string ilasm = configuration.TargetRuntime.GetToolPath (configuration.TargetFramework, "ilasm"); + string outstr = ilasm + " " + sb.ToString (); monitor.Log.WriteLine (outstr); string workingDir = "."; @@ -104,8 +104,7 @@ namespace ILAsmBinding LoggingService.LogInfo ("ilasm " + sb.ToString ()); - //FIXME: is Current the real target framework?
- Dictionary<string,string> envVars = MonoDevelop.Core.Runtime.SystemAssemblyService.CurrentRuntime.GetToolsEnvironmentVariables (configuration.TargetFramework); + Dictionary<string,string> envVars = configuration.TargetRuntime.GetToolsEnvironmentVariables (configuration.TargetFramework); int exitCode = DoCompilation (outstr, workingDir, envVars, gacRoots, ref output, ref error); BuildResult result = ParseOutput (output, error); |