Browse Source

* search for i386-linux-gcc also by trying i686-linux- as prefix as
apparently for newer gcc -m32 does not return the proper libgcc path anymore

florian 2 years ago
parent
commit
20884fdc1b
2 changed files with 4 additions and 1 deletions
  1. 3 0
      packages/fpmkunit/src/fpmkunit.pp
  2. 1 1
      utils/fpcm/revision.inc

+ 3 - 0
packages/fpmkunit/src/fpmkunit.pp

@@ -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}

+ 1 - 1
utils/fpcm/revision.inc

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