pyrox.dev
1diff --git a/fpcsrc/compiler/systems/t_linux.pas b/fpcsrc/compiler/systems/t_linux.pas
2index a7398fb9..8e46fec0 100644
3--- a/fpcsrc/compiler/systems/t_linux.pas
4+++ b/fpcsrc/compiler/systems/t_linux.pas
5@@ -135,13 +135,13 @@ begin
6 LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib64',true);
7 { /lib64 should be the really first, so add it before everything else }
8 LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib',true);
9- LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib64',true);
10+ LibrarySearchPath.AddLibraryPath(sysrootpath,'=@syslibpath@',true);
11 {$else}
12 {$ifdef powerpc64}
13 if target_info.abi<>abi_powerpc_elfv2 then
14- LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib64;=/usr/lib64;=/usr/X11R6/lib64',true)
15+ LibrarySearchPath.AddLibraryPath(sysrootpath,'=/@syslibpath@;=/usr/lib64;=/usr/X11R6/lib64',true)
16 else
17- LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib64;=/usr/lib/powerpc64le-linux-gnu;=/usr/X11R6/powerpc64le-linux-gnu',true);
18+ LibrarySearchPath.AddLibraryPath(sysrootpath,'=/@syslibpath@;=/usr/lib/powerpc64le-linux-gnu;=/usr/X11R6/powerpc64le-linux-gnu',true);
19 {$else powerpc64}
20 LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib;=/usr/lib;=/usr/X11R6/lib',true);
21 {$endif powerpc64}
22@@ -165,7 +165,7 @@ begin
23 {$endif i386}
24 {$ifdef aarch64}
25 LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib64',true);
26- LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/aarch64-linux-gnu',true);
27+ LibrarySearchPath.AddLibraryPath(sysrootpath,'=@syslibpath@',true);
28 {$endif aarch64}
29 {$ifdef powerpc}
30 LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/powerpc-linux-gnu',true);
31@@ -186,53 +186,53 @@ begin
32 end;
33
34 {$ifdef m68k}
35- const defdynlinker='/lib/ld.so.1';
36+ const defdynlinker='@dynlinker-prefix@/lib/ld.so.1';
37 {$endif m68k}
38
39 {$ifdef i386}
40- const defdynlinker='/lib/ld-linux.so.2';
41+ const defdynlinker='@dynlinker-prefix@/lib/ld-linux.so.2';
42 {$endif}
43
44 {$ifdef x86_64}
45- const defdynlinker='/lib64/ld-linux-x86-64.so.2';
46+ const defdynlinker='@dynlinker-prefix@/lib64/ld-linux-x86-64.so.2';
47 {$endif x86_64}
48
49 {$ifdef sparc}
50- const defdynlinker='/lib/ld-linux.so.2';
51+ const defdynlinker='@dynlinker-prefix@/lib/ld-linux.so.2';
52 {$endif sparc}
53
54 {$ifdef powerpc}
55- const defdynlinker='/lib/ld.so.1';
56+ const defdynlinker='@dynlinker-prefix@/lib/ld.so.1';
57 {$endif powerpc}
58
59 {$ifdef powerpc64}
60- const defdynlinkerv1='/lib64/ld64.so.1';
61- const defdynlinkerv2='/lib64/ld64.so.2';
62+ const defdynlinkerv1='@dynlinker-prefix@/lib64/ld64.so.1';
63+ const defdynlinkerv2='@dynlinker-prefix@/lib64/ld64.so.2';
64 var defdynlinker: string;
65 {$endif powerpc64}
66
67 {$ifdef arm}
68 {$ifdef FPC_ARMHF}
69- const defdynlinker='/lib/ld-linux-armhf.so.3';
70+ const defdynlinker='@dynlinker-prefix@/lib/ld-linux-armhf.so.3';
71 {$else FPC_ARMHF}
72 {$ifdef FPC_ARMEL}
73- const defdynlinker='/lib/ld-linux.so.3';
74+ const defdynlinker='@dynlinker-prefix@/lib/ld-linux.so.3';
75 {$else FPC_ARMEL}
76- const defdynlinker='/lib/ld-linux.so.2';
77+ const defdynlinker='@dynlinker-prefix@/lib/ld-linux.so.2';
78 {$endif FPC_ARMEL}
79 {$endif FPC_ARMHF}
80 {$endif arm}
81
82 {$ifdef aarch64}
83-const defdynlinker='/lib/ld-linux-aarch64.so.1';
84+const defdynlinker='@dynlinker-prefix@/lib/ld-linux-aarch64.so.1';
85 {$endif aarch64}
86
87 {$ifdef mips}
88- const defdynlinker='/lib/ld.so.1';
89+ const defdynlinker='@dynlinker-prefix@/lib/ld.so.1';
90 {$endif mips}
91
92 {$ifdef sparc64}
93- const defdynlinker='/lib64/ld-linux.so.2';
94+ const defdynlinker='@dynlinker-prefix@/lib64/ld-linux.so.2';
95 {$endif sparc64}
96
97
98@@ -267,9 +267,9 @@ begin
99 libctype:=uclibc;
100 end
101 {$ifdef i386}
102- else if FileExists(sysrootpath+'/lib/ld-linux.so.1',false) then
103+ else if FileExists(sysrootpath+'@dynlinker-prefix@/lib/ld-linux.so.1',false) then
104 begin
105- DynamicLinker:='/lib/ld-linux.so.1';
106+ DynamicLinker:='@dynlinker-prefix@/lib/ld-linux.so.1';
107 libctype:=glibc2;
108 end
109 {$endif i386}