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

* search for i386-linux-gcc also by trying i686-linux- as prefix as

Browse Source 
apparently for newer gcc -m32 does not return the proper libgcc path anymore
This commit is contained in:
florian 2023-06-20 23:16:16 +02:00
parent 41c2a2069a
commit 20884fdc1b
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/fpmkunit/src/fpmkunit.pp
View File

@ -3076,6 +3076,9 @@ var
GccExecutable := ExeSearch(AddProgramExtension(CrossPrefix+'gcc', OS),Sysutils.GetEnvironmentVariable('PATH')); GccExecutable := ExeSearch(AddProgramExtension(CrossPrefix+'gcc', OS),Sysutils.GetEnvironmentVariable('PATH'));
if not(FileExists(GccExecutable)) then if not(FileExists(GccExecutable)) then
GccExecutable := ExeSearch(AddProgramExtension(CrossPrefix+'gnu-gcc', OS),Sysutils.GetEnvironmentVariable('PATH')); GccExecutable := ExeSearch(AddProgramExtension(CrossPrefix+'gnu-gcc', OS),Sysutils.GetEnvironmentVariable('PATH'));
{ ugly hack to find gcc on newer linuxes }
if not(FileExists(GccExecutable)) and (CrossPrefix='i386-linux-') then
GccExecutable := ExeSearch(AddProgramExtension('i686-linux-gnu-gcc', OS),Sysutils.GetEnvironmentVariable('PATH'));
if FileExists(GccExecutable) then if FileExists(GccExecutable) then
begin begin
{$ifdef HAS_UNIT_PROCESS} {$ifdef HAS_UNIT_PROCESS}

2
utils/fpcm/revision.inc
View File

@ -1 +1 @@
'2023-03-27 hash 327aac7f24' '2023-06-19 hash 193550945c'