Even better handling of Darwin cross-compiler naming.

LongDirtyAnimAlf · Jul 5, 2023 · 9bfefe0 · 9bfefe0
1 parent a5dd0a8
commit 9bfefe0
Show file tree

Hide file tree

Showing 4 changed files with 84 additions and 157 deletions.
diff --git a/public/gitrevision.txt b/public/gitrevision.txt
@@ -1 +1 @@
-[master]v2.2.0s-2757(bc6bba2)
+[master]v2.2.0s-2758(a5dd0a8)
diff --git a/sources/installercore.pas b/sources/installercore.pas
@@ -367,6 +367,7 @@   TInstaller = class(TObject)
     {$IFDEF UNIX}
     FUseCompilerWrapper        : boolean;
     {$ENDIF}
+    function GetDefaultCompilerFilename(const TargetCPU: TCPU; const Cross: boolean): string;
   private
     FURL                       : string;
     FUltibo                    : boolean;
@@ -403,7 +404,6 @@   TInstaller = class(TObject)
     function GetCrossInstaller: TCrossInstaller;
     function GetFullVersionString:string;
     function GetFullVersion:dword;
-    function GetDefaultCompilerFilename(const TargetCPU: TCPU; Cross: boolean): string;
     function GetInstallerClass(aClassToFind:TClass):boolean;
     function IsFPCInstaller:boolean;
     function IsLazarusInstaller:boolean;
@@ -4074,31 +4074,19 @@ function TInstaller.GetFPCConfigPath(const aCFG:string):string;
   result:=result+aCFG;
 end;
 
-function TInstaller.GetDefaultCompilerFilename(const TargetCPU: TCPU; Cross: boolean): string;
+function TInstaller.GetDefaultCompilerFilename(const TargetCPU: TCPU; const Cross: boolean): string;
 var
   s:string;
 begin
   s:='fpc';
   if TargetCPU<>TCPU.cpuNone then
   begin
     if Cross then
-    begin
-      // See fpc.pp
-      {$ifndef darwin}
       s:='ppcross'+ppcSuffix[TargetCPU]
-      {$else not darwin}
-      { the mach-o format supports "fat" binaries whereby }
-      { a single executable contains machine code for     }
-      { several architectures -> it is counter-intuitive  }
-      { and non-standard to use different binary names    }
-      { for cross-compilers vs. native compilers          }
-      s:='ppc'+ppcSuffix[TargetCPU];
-      {$endif not darwin}
-    end
     else
       s:='ppc'+ppcSuffix[TargetCPU];
   end;
-  Result:=s+GetExeExt;
+  result:=s+GetExeExt;
 end;
 
 function TInstaller.GetCompilerName(Cpu_Target:TCPU):string;
@@ -4126,7 +4114,7 @@ function TInstaller.GetCompilerName(Cpu_Target:string):string;
 
 function TInstaller.GetCrossCompilerName(Cpu_Target:TCPU):string;
 begin
-  if Cpu_Target<>TCPU.jvm
+  if (Cpu_Target<>TCPU.jvm)
      then result:=GetDefaultCompilerFilename(Cpu_Target,true)
      else result:=GetDefaultCompilerFilename(Cpu_Target,false);
 end;