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

* patch by Alfred to use new linker names for Android NDK >=22, resolves #38987

Browse Source 
git-svn-id: trunk@49498 -
This commit is contained in:
florian 2021-06-12 20:45:15 +00:00
parent 97b2f7a5e1
commit 9d2e71ff69
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
compiler/systems/t_android.pas
View File

@ -436,14 +436,16 @@ begin
if IsSharedLib then
Replace(cmdstr,'$SONAME',ExtractFileName(outname));
binstr:=FindUtil(utilsprefix+BinStr);
{ We should use BFD version of LD, since GOLD version does not support INSERT command in linker scripts }
if binstr <> '' then begin
{ Checking if ld.bfd exists }
s:=ChangeFileExt(binstr, '.bfd' + source_info.exeext);
s:=utilsprefix+binstr+'.bfd';
if (source_info.exeext<>'') then
s:=s+source_info.exeext;
s:=FindUtil(s);
if FileExists(s, True) then
binstr:=s;
end;
binstr:=s
else
// fallback to ld for very old or custom binutils
binstr:=FindUtil(utilsprefix+BinStr);
success:=DoExec(binstr,CmdStr,true,false);