mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Add msvcrt library to link step

Browse source
This commit is contained in:
Bryan Thornbury 2015-11-18 15:48:11 -08:00 • committed by Livar Cunha
parent a997f65a4e
commit 9fbf7a7995
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/Microsoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Windows/WindowsLinkStep.cs
View file

@ -45,6 +45,12 @@ namespace Microsoft.DotNet.Tools.Compiler.Native
"odbc32.lib", "odbc32.lib",
"odbccp32.lib" "odbccp32.lib"
}; };
private static readonly Dictionary<BuildConfiguration, string[]> ConfigurationLinkLibMap = new Dictionary<BuildConfiguration, string[]>()
{
{ BuildConfiguration.debug , new string[] { "msvcrtd" } },
{ BuildConfiguration.release , new string[] { "msvcrt" } }
};
private string ArgStr { get; set; } private string ArgStr { get; set; }
private NativeCompileSettings config; private NativeCompileSettings config;
@ -99,6 +105,13 @@ namespace Microsoft.DotNet.Tools.Compiler.Native
argsList.Add(Path.Combine(config.IlcPath, lib)); argsList.Add(Path.Combine(config.IlcPath, lib));
} }
// Configuration Based Libs
var configLibs = ConfigurationLinkLibMap[config.BuildType];
foreach (var lib in configLibs)
{
argsList.Add(lib);
}
// Link Libs // Link Libs
foreach(var path in config.LinkLibPaths){ foreach(var path in config.LinkLibPaths){
argsList.Add($"\"{path}\""); argsList.Add($"\"{path}\"");