mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-09-12 09:49:11 +02:00
Fix linking error, in which libc.so.6 is not found on aarch64-linux when libdl.so is loaded, by adding appropriate directory
git-svn-id: trunk@44215 -
This commit is contained in:
parent
200de64085
commit
346118187b
@ -152,34 +152,44 @@ begin
|
|||||||
for other arm flavours, this cannot hurt }
|
for other arm flavours, this cannot hurt }
|
||||||
{$ifdef FPC_ARMHF}
|
{$ifdef FPC_ARMHF}
|
||||||
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/arm-linux-gnueabihf',true);
|
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/arm-linux-gnueabihf',true);
|
||||||
|
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib/arm-linux-gnueabihf',true);
|
||||||
{$endif FPC_ARMHF}
|
{$endif FPC_ARMHF}
|
||||||
{$ifdef FPC_ARMEL}
|
{$ifdef FPC_ARMEL}
|
||||||
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/arm-linux-gnueabi',true);
|
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/arm-linux-gnueabi',true);
|
||||||
|
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib/arm-linux-gnueabi',true);
|
||||||
{$endif}
|
{$endif}
|
||||||
{$endif arm}
|
{$endif arm}
|
||||||
{$ifdef x86_64}
|
{$ifdef x86_64}
|
||||||
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/x86_64-linux-gnu',true);
|
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/x86_64-linux-gnu',true);
|
||||||
|
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib/x86_64-linux-gnu',true);
|
||||||
{$endif x86_64}
|
{$endif x86_64}
|
||||||
{$ifdef i386}
|
{$ifdef i386}
|
||||||
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/i386-linux-gnu',true);
|
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/i386-linux-gnu',true);
|
||||||
|
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib/i386-linux-gnu',true);
|
||||||
{$endif i386}
|
{$endif i386}
|
||||||
{$ifdef aarch64}
|
{$ifdef aarch64}
|
||||||
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/aarch64-linux-gnu',true);
|
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/aarch64-linux-gnu',true);
|
||||||
|
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib/aarch64-linux-gnu',true);
|
||||||
{$endif aarch64}
|
{$endif aarch64}
|
||||||
{$ifdef powerpc}
|
{$ifdef powerpc}
|
||||||
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/powerpc-linux-gnu',true);
|
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/powerpc-linux-gnu',true);
|
||||||
|
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib/powerpc-linux-gnu',true);
|
||||||
{$endif powerpc}
|
{$endif powerpc}
|
||||||
{$ifdef m68k}
|
{$ifdef m68k}
|
||||||
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/m68k-linux-gnu',true);
|
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/m68k-linux-gnu',true);
|
||||||
|
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib/m68k-linux-gnu',true);
|
||||||
{$endif m68k}
|
{$endif m68k}
|
||||||
{$ifdef mipsel}
|
{$ifdef mipsel}
|
||||||
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/mipsel-linux-gnu',true);
|
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/mipsel-linux-gnu',true);
|
||||||
|
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib/mipsel-linux-gnu',true);
|
||||||
{$endif mipsel}
|
{$endif mipsel}
|
||||||
{$ifdef mips}
|
{$ifdef mips}
|
||||||
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/mips-linux-gnu',true);
|
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/mips-linux-gnu',true);
|
||||||
|
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib/mips-linux-gnu',true);
|
||||||
{$endif mips}
|
{$endif mips}
|
||||||
{$ifdef sparc64}
|
{$ifdef sparc64}
|
||||||
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/sparc64-linux-gnu',true);
|
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/sparc64-linux-gnu',true);
|
||||||
|
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib/sparc64-linux-gnu',true);
|
||||||
{$endif sparc64}
|
{$endif sparc64}
|
||||||
{$ifdef riscv32}
|
{$ifdef riscv32}
|
||||||
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/riscv32-linux-gnu',true);
|
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/riscv32-linux-gnu',true);
|
||||||
|
Loading…
Reference in New Issue
Block a user