GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Fix using dynamic libraries resolving path on Linux

Browse Source
This commit is contained in:
mafiesto4
2021-01-17 21:50:58 +01:00
parent 837174582b
commit fcc4b371b9
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Tools/Flax.Build/Platforms/Linux/LinuxToolchain.cs
View File

@@ -52,6 +52,8 @@ namespace Flax.Build.Platforms
{ {
base.SetupLinkFilesArgs(graph, options, args, outputFilePath); base.SetupLinkFilesArgs(graph, options, args, outputFilePath);
args.Add("-Wl,-rpath,\"\\$ORIGIN\"");
// Speed up build // Speed up build
//args.Add("-Wl,--as-needed"); //args.Add("-Wl,--as-needed");
args.Add("-Wl,--hash-style=gnu"); args.Add("-Wl,--hash-style=gnu");

2
Source/Tools/Flax.Build/Platforms/Unix/UnixToolchain.cs
View File

@@ -198,6 +198,7 @@ namespace Flax.Build.Platforms
/// <inheritdoc /> /// <inheritdoc />
public override void LogInfo() public override void LogInfo()
{ {
if (!string.IsNullOrEmpty(ToolsetRoot))
Log.Info("Toolset root: " + ToolsetRoot); Log.Info("Toolset root: " + ToolsetRoot);
Log.Info("Clang version: " + ClangVersion); Log.Info("Clang version: " + ClangVersion);
} }
@@ -449,7 +450,6 @@ namespace Flax.Build.Platforms
var args = new List<string>(); var args = new List<string>();
{ {
args.Add(string.Format("-o \"{0}\"", outputFilePath)); args.Add(string.Format("-o \"{0}\"", outputFilePath));
//args.Add(string.Format("-rpath-link=\"{0}\"", Path.GetDirectoryName(outputFilePath).Replace('\\', '/')));
if (!options.LinkEnv.DebugInformation) if (!options.LinkEnv.DebugInformation)
{ {