This is an automated email from the ASF dual-hosted git repository.

ardovm pushed a commit to branch scons-build
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/scons-build by this push:
     new 14dffb98f5 Fix the SCons platform file for Linux
14dffb98f5 is described below

commit 14dffb98f5f477a46d3b03e833d2043999a340a8
Author: Arrigo Marchiori <[email protected]>
AuthorDate: Sun Apr 2 12:44:17 2023 +0200

    Fix the SCons platform file for Linux
---
 main/site_scons/platform/linux.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/main/site_scons/platform/linux.py 
b/main/site_scons/platform/linux.py
index 657fe799da..ad690d82b9 100644
--- a/main/site_scons/platform/linux.py
+++ b/main/site_scons/platform/linux.py
@@ -217,7 +217,14 @@ class Linux(aooplatform.Platform):
     def getExecutableLDFlags(self, soenv, group, outDirLocation, debugging, 
debugLevel):
         flags = self.getLDFlags(soenv, debugging, debugLevel)
         flags += [
-            '-Wl,-rpath,' + self.getRPATH(self.executableGroupLayers(group)),
+            '-Wl,-rpath,' + self.getRPATH(self.executableGroupLayers[group]),
+            '-Wl,-rpath-link,' + outDirLocation
+        ]
+        return flags
+
+    def getGoogleTestLDFlags(self, soenv, outDirLocation, debugging, 
debugLevel):
+        flags = self.getLDFlags(soenv, debugging, debugLevel)
+        flags += [
             '-Wl,-rpath-link,' + outDirLocation
         ]
         return flags

Reply via email to