Merge pull request #962 from jkotas/issue-941

Workaround for missing debugging symbols for System.Private.* stuff
dotnet · Feb 29, 2016 · 1fae497 · 1fae497
2 parents d3f95ea + 2f98e96
commit 1fae497
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Documentation/how-to-build-and-run-ilcompiler-in-visual-studio-2015.md b/Documentation/how-to-build-and-run-ilcompiler-in-visual-studio-2015.md
@@ -25,7 +25,7 @@ build.cmd clean
   - Set "desktop" project in solution explorer as your startup project
 
   - Set startup command line to:
-`@c:\corert\bin\obj\Windows_NT.x64.Debug\ryujit.rsp`
+`-r:C:\corert\bin\Product\Windows_NT.x64.Debug\System.Private.CoreLib.dll @c:\corert\bin\obj\Windows_NT.x64.Debug\ryujit.rsp`
 
   - Build & run using **F5**
     - This will run the compiler. The output is `c:\corert\src\ILCompiler\repro\obj\Debug\dnxcore50\native\repro.obj` file.
@@ -48,7 +48,7 @@ build.cmd clean
   - Set "desktop" project in solution explorer as your startup project
 
   - Set startup command line to:
-`@c:\corert\bin\obj\Windows_NT.x64.Debug\cpp.rsp`
+`-r:C:\corert\bin\Product\Windows_NT.x64.Debug\System.Private.CoreLib.dll @c:\corert\bin\obj\Windows_NT.x64.Debug\cpp.rsp`
 
     - `-nolinenumbers` command line option can be used to suppress generation of line number mappings in C++ files - useful for debugging
 

diff --git a/src/ILCompiler/src/Program.cs b/src/ILCompiler/src/Program.cs
@@ -83,7 +83,7 @@ private ArgumentSyntax ParseCommandLine(string[] args)
                 // HandleHelp writes to error, fails fast with crash dialog and lacks custom formatting.
                 syntax.HandleHelp = false;
                 syntax.HandleErrors = true;
-            
+
                 syntax.DefineOption("h|help", ref _help, "Help message for ILC");
                 syntax.DefineOptionList("r|reference", ref referenceFiles, "Reference file(s) for compilation");
                 syntax.DefineOption("o|out", ref _options.OutputFilePath, "Output file path");
@@ -100,7 +100,7 @@ private ArgumentSyntax ParseCommandLine(string[] args)
                 Helpers.AppendExpandedPaths(_inputFilePaths, input, true);
 
             foreach (var reference in referenceFiles)
-                Helpers.AppendExpandedPaths(_referenceFilePaths, reference, true);
+                Helpers.AppendExpandedPaths(_referenceFilePaths, reference, false);
 
             return argSyntax;
         }