paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-13 11:39:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

* respect Dontlinkstdlibpath when adding a default library search path

Browse Source 
git-svn-id: trunk@22011 -
This commit is contained in:
florian 2012-08-04 17:29:07 +00:00
parent 19ed835f2b
commit ad3aa937d3
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
compiler/systems/t_linux.pas
View File

@ -112,12 +112,12 @@ procedure SetupLibrarySearchPath;
begin begin
if not Dontlinkstdlibpath Then if not Dontlinkstdlibpath Then
{$ifdef x86_64} {$ifdef x86_64}
LibrarySearchPath.AddPath(sysrootpath,'/lib64;/usr/lib64;/usr/X11R6/lib64',true); LibrarySearchPath.AddPath(sysrootpath,'/lib64;/usr/lib64;/usr/X11R6/lib64',true);
{$else} {$else}
{$ifdef powerpc64} {$ifdef powerpc64}
LibrarySearchPath.AddPath(sysrootpath,'/lib64;/usr/lib64;/usr/X11R6/lib64',true); LibrarySearchPath.AddPath(sysrootpath,'/lib64;/usr/lib64;/usr/X11R6/lib64',true);
{$else powerpc64} {$else powerpc64}
LibrarySearchPath.AddPath(sysrootpath,'/lib;/usr/lib;/usr/X11R6/lib',true); LibrarySearchPath.AddPath(sysrootpath,'/lib;/usr/lib;/usr/X11R6/lib',true);
{$endif powerpc64} {$endif powerpc64}
{$endif x86_64} {$endif x86_64}
@ -125,7 +125,8 @@ begin
{$ifdef FPC_ARMHF} {$ifdef FPC_ARMHF}
{ at least raspian has the crt*.o files at an uncommon location, { at least raspian has the crt*.o files at an uncommon location,
for other arm flavours, this cannot hurt } for other arm flavours, this cannot hurt }
LibrarySearchPath.AddPath(sysrootpath,'/usr/lib/arm-linux-gnueabihf',true); if not Dontlinkstdlibpath Then
LibrarySearchPath.AddPath(sysrootpath,'/usr/lib/arm-linux-gnueabihf',true);
{$endif FPC_ARMHF} {$endif FPC_ARMHF}
{$endif arm} {$endif arm}
end; end;