diff --git a/Source/Tools/Flax.Build/Platforms/Linux/LinuxToolchain.cs b/Source/Tools/Flax.Build/Platforms/Linux/LinuxToolchain.cs
index 93f1e8334..535b329b6 100644
--- a/Source/Tools/Flax.Build/Platforms/Linux/LinuxToolchain.cs
+++ b/Source/Tools/Flax.Build/Platforms/Linux/LinuxToolchain.cs
@@ -52,6 +52,8 @@ namespace Flax.Build.Platforms
         {
             base.SetupLinkFilesArgs(graph, options, args, outputFilePath);
 
+            args.Add("-Wl,-rpath,\"\\$ORIGIN\"");
+
             // Speed up build
             //args.Add("-Wl,--as-needed");
             args.Add("-Wl,--hash-style=gnu");
diff --git a/Source/Tools/Flax.Build/Platforms/Unix/UnixToolchain.cs b/Source/Tools/Flax.Build/Platforms/Unix/UnixToolchain.cs
index bd89082e7..a6813c4bc 100644
--- a/Source/Tools/Flax.Build/Platforms/Unix/UnixToolchain.cs
+++ b/Source/Tools/Flax.Build/Platforms/Unix/UnixToolchain.cs
@@ -198,7 +198,8 @@ namespace Flax.Build.Platforms
         /// <inheritdoc />
         public override void LogInfo()
         {
-            Log.Info("Toolset root: " + ToolsetRoot);
+            if (!string.IsNullOrEmpty(ToolsetRoot))
+                Log.Info("Toolset root: " + ToolsetRoot);
             Log.Info("Clang version: " + ClangVersion);
         }
 
@@ -449,7 +450,6 @@ namespace Flax.Build.Platforms
             var args = new List<string>();
             {
                 args.Add(string.Format("-o \"{0}\"", outputFilePath));
-                //args.Add(string.Format("-rpath-link=\"{0}\"", Path.GetDirectoryName(outputFilePath).Replace('\\', '/')));
 
                 if (!options.LinkEnv.DebugInformation)
                 {