paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-06-19 07:18:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fixed shared linker name for i386

Browse Source 
* restored old shared linker search order as good as possible

git-svn-id: trunk@11558 -
This commit is contained in:
florian 2008-08-12 16:45:07 +00:00
parent 8f23e55789
commit 8f95bb12ac
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
compiler/systems/t_linux.pas
View File

@ -160,7 +160,7 @@ begin
{$endif m68k} {$endif m68k}
{$ifdef i386} {$ifdef i386}
defdynlinker:='/lib/ld-linux.so.1'; defdynlinker:='/lib/ld-linux.so.2';
{$endif} {$endif}
{$ifdef x86_64} {$ifdef x86_64}
@ -194,24 +194,27 @@ begin
glibc 2.0 glibc 2.0
If none is found (e.g. when cross compiling) glibc21 is assumed If none is found (e.g. when cross compiling) glibc21 is assumed
} }
{$ifdef i386} if fileexists(sysrootpath+defdynlinker,false) then
if FileExists(sysrootpath+'/lib/ld-linux.so.2',false) then
begin begin
DynamicLinker:='/lib/ld-linux.so.2'; DynamicLinker:=defdynlinker;
{$ifdef i386}
libctype:=glibc21; libctype:=glibc21;
end {$else i386}
else libctype:=glibc2;
{$endif i386} {$endif i386}
if fileexists(sysrootpath+'/lib/ld-uClibc.so.0',false) then end
else if fileexists(sysrootpath+'/lib/ld-uClibc.so.0',false) then
begin begin
dynamiclinker:='/lib/ld-uClibc.so.0'; dynamiclinker:='/lib/ld-uClibc.so.0';
libctype:=uclibc; libctype:=uclibc;
end end
else if fileexists(sysrootpath+defdynlinker,false) then {$ifdef i386}
else if FileExists(sysrootpath+'/lib/ld-linux.so.1',false) then
begin begin
DynamicLinker:=defdynlinker; DynamicLinker:='/lib/ld-linux.so.1';
libctype:=glibc2; libctype:=glibc2;
end end
{$endif i386}
else else
begin begin
{ when no dyn. linker is found, we are probably { when no dyn. linker is found, we are probably