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

Merge pull request #2101 from nattress/linkerscript

Browse source 
Add dotnet-compile-native linker script for Linux / OSX
This commit is contained in:
Piotr Puszkiewicz 2016-03-28 22:30:06 -07:00
commit 84c435d21f
2 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/dotnet/commands/dotnet-compile-native/IntermediateCompilation/Linux/LinuxRyuJitCompileStep.cs
View file

@ -70,6 +70,13 @@ namespace Microsoft.DotNet.Tools.Compiler.Native
var ilcSdkLibPath = Path.Combine(config.IlcSdkPath, "sdk");
argsList.AddRange(_ilcSdkLibs.Select(lib => Path.Combine(ilcSdkLibPath, lib)));
// Optional linker script
var linkerScriptFile = Path.Combine(ilcSdkLibPath, "linkerscript");
if (File.Exists(linkerScriptFile))
{
argsList.Add(linkerScriptFile);
}
// AppDep Libs
var baseAppDepLibPath = Path.Combine(config.AppDepSDKPath, "CPPSdk/ubuntu.14.04", config.Architecture.ToString());
argsList.AddRange(_appdeplibs.Select(lib => Path.Combine(baseAppDepLibPath, lib)));

7
src/dotnet/commands/dotnet-compile-native/IntermediateCompilation/Mac/MacRyuJitCompileStep.cs
View file

@ -72,6 +72,13 @@ namespace Microsoft.DotNet.Tools.Compiler.Native
var ilcSdkLibPath = Path.Combine(config.IlcSdkPath, "sdk");
argsList.AddRange(_ilcSdkLibs.Select(lib => Path.Combine(ilcSdkLibPath, lib)));
// Optional linker script
var linkerScriptFile = Path.Combine(ilcSdkLibPath, "linkerscript");
if (File.Exists(linkerScriptFile))
{
argsList.Add(linkerScriptFile);
}
// AppDep Libs
var baseAppDepLibPath = Path.Combine(config.AppDepSDKPath, "CPPSdk/osx.10.10", config.Architecture.ToString());
argsList.AddRange(appdeplibs.Select(lib => Path.Combine(baseAppDepLibPath, lib)));