summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorflorian <florian@3ad0048d-3df7-0310-abae-a5850022a9f2>2021-04-11 17:30:22 +0000
committerflorian <florian@3ad0048d-3df7-0310-abae-a5850022a9f2>2021-04-11 17:30:22 +0000
commit82c46895bc054c5b6027bc0927ed829f8c162cd5 (patch)
treede87a4bc394cc57cfdd653a2d3e253a887274e07
parenta664cd401bf21259c7481a7a9af31ca3c206c1ac (diff)
downloadfpc-82c46895bc054c5b6027bc0927ed829f8c162cd5.tar.gz
* newer linux distros might have powerpc64 libraries in /usr/lib or /lib
git-svn-id: https://svn.freepascal.org/svn/fpc/trunk@49182 3ad0048d-3df7-0310-abae-a5850022a9f2
-rw-r--r--compiler/systems/t_linux.pas9
1 files changed, 7 insertions, 2 deletions
diff --git a/compiler/systems/t_linux.pas b/compiler/systems/t_linux.pas
index 7145003bce..a2d48b7641 100644
--- a/compiler/systems/t_linux.pas
+++ b/compiler/systems/t_linux.pas
@@ -140,9 +140,14 @@ begin
{$else}
{$ifdef powerpc64}
if target_info.abi<>abi_powerpc_elfv2 then
- LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib64;=/usr/lib64;=/usr/X11R6/lib64',true)
+ LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/X11R6/lib64',true)
else
- LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib64;=/usr/lib/powerpc64le-linux-gnu;=/usr/X11R6/powerpc64le-linux-gnu',true);
+ LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/powerpc64le-linux-gnu;=/usr/X11R6/powerpc64le-linux-gnu',true);
+ LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib',true);
+ LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib64',true);
+ { /lib64 should be the really first, so add it before everything else }
+ LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib',true);
+ LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib64',true);
{$else powerpc64}
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib;=/usr/lib;=/usr/X11R6/lib',true);
{$endif powerpc64}