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

Merge pull request #272 from dotnet/quotes

Browse source 
Fix quotes in native CPP intermediate compilation
This commit is contained in:
Senthil 2015-11-20 00:23:23 -08:00
commit b9666d0fea
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Microsoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Windows/WindowsCppCompileStep.cs
View file

@ -68,11 +68,13 @@ namespace Microsoft.DotNet.Tools.Compiler.Native
argsList.Add("/c"); argsList.Add("/c");
// Add Includes // Add Includes
var win7CppSdkPath = Path.Combine(config.AppDepSDKPath, "CPPSdk\\win7");
argsList.Add("/I"); argsList.Add("/I");
argsList.Add(Path.Combine(config.AppDepSDKPath, "CPPSdk\\win7")); argsList.Add($"\"{win7CppSdkPath}\"");
var cppSdkPath = Path.Combine(config.AppDepSDKPath, "CPPSdk");
argsList.Add("/I"); argsList.Add("/I");
argsList.Add(Path.Combine(config.AppDepSDKPath, "CPPSdk")); argsList.Add($"\"{cppSdkPath}\"");
// Configuration Based Compiler Options // Configuration Based Compiler Options
argsList.Add(ConfigurationCompilerOptionsMap[config.BuildType]); argsList.Add(ConfigurationCompilerOptionsMap[config.BuildType]);
@ -83,7 +85,7 @@ namespace Microsoft.DotNet.Tools.Compiler.Native
// Input File // Input File
var inCppFile = DetermineInFile(config); var inCppFile = DetermineInFile(config);
argsList.Add(inCppFile); argsList.Add($"\"{inCppFile}\"");
this.CompilerArgStr = string.Join(" ", argsList); this.CompilerArgStr = string.Join(" ", argsList);
} }
@ -124,4 +126,4 @@ namespace Microsoft.DotNet.Tools.Compiler.Native
} }
} }
} }