diff --git a/src/Microsoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Windows/WindowsLinkStep.cs b/src/Microsoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Windows/WindowsLinkStep.cs index 8484678a8..bbb6a6243 100644 --- a/src/Microsoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Windows/WindowsLinkStep.cs +++ b/src/Microsoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Windows/WindowsLinkStep.cs @@ -45,6 +45,12 @@ namespace Microsoft.DotNet.Tools.Compiler.Native "odbc32.lib", "odbccp32.lib" }; + + private static readonly Dictionary ConfigurationLinkLibMap = new Dictionary() + { + { BuildConfiguration.debug , new string[] { "msvcrtd" } }, + { BuildConfiguration.release , new string[] { "msvcrt" } } + }; private string ArgStr { get; set; } private NativeCompileSettings config; @@ -99,6 +105,13 @@ namespace Microsoft.DotNet.Tools.Compiler.Native 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 foreach(var path in config.LinkLibPaths){ argsList.Add($"\"{path}\"");