Browse Source

+ add debian armel library search path
+ for armhf, use the more canonical ld-linux-armhf.so.3 as defdynlinker

git-svn-id: trunk@22416 -

tom_at_work 13 years ago
parent
commit
f5ddc02a5c
1 changed files with 6 additions and 3 deletions
  1. 6 3
      compiler/systems/t_linux.pas

+ 6 - 3
compiler/systems/t_linux.pas

@@ -122,12 +122,15 @@ begin
 {$endif x86_64}
 
 {$ifdef arm}
-{$ifdef FPC_ARMHF}
-  { at least raspian has the crt*.o files at an uncommon location,
+  { some newver Debian have the crt*.o files at uncommon locations,
     for other arm flavours, this cannot hurt }
   if not Dontlinkstdlibpath Then
+{$ifdef FPC_ARMHF}
     LibrarySearchPath.AddPath(sysrootpath,'/usr/lib/arm-linux-gnueabihf',true);
 {$endif FPC_ARMHF}
+{$ifdef FPC_ARMEL}
+    LibrarySearchPath.AddPath(sysrootpath,'/usr/lib/arm-linux-gnueabi',true);
+{$endif}
 {$endif arm}
 end;
 
@@ -158,7 +161,7 @@ end;
 
 {$ifdef arm}
 {$ifdef FPC_ARMHF}
-  const defdynlinker='/lib/arm-linux-gnueabihf/ld-linux.so.3';
+  const defdynlinker='/lib/ld-linux-armhf.so.3';
 {$else FPC_ARMHF}
 {$ifdef FPC_ARMEL}
   const defdynlinker='/lib/ld-linux.so.3';