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

IDE: fixed IDE restart when project is set to cross compile, issue #36142

Browse Source 
git-svn-id: trunk@62022 -
This commit is contained in:
mattias 2019-10-10 12:32:20 +00:00
parent cd76eb1ef2
commit 9c7ef38222
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ide/buildmanager.pas
View File

@ -2895,6 +2895,8 @@ begin
end; end;
function TBuildManager.BuildTargetIDEIsDefault: boolean; function TBuildManager.BuildTargetIDEIsDefault: boolean;
// check if current BuildLazarus creates the normal lazarus exe
// aka not some cross compile
var var
NewTargetOS: String; NewTargetOS: String;
NewTargetCPU: String; NewTargetCPU: String;
@ -2908,8 +2910,8 @@ begin
//debugln(['TBuildManager.BuildTargetIDEIsDefault NewTargetOS=',NewTargetOS,' Default=',GetDefaultTargetOS,' NewTargetCPU=',NewTargetCPU,' default=',GetDefaultTargetCPU,' ws=',LCLPlatformDisplayNames[NewLCLWidgetSet],' default=',LCLPlatformDisplayNames[GetDefaultLCLWidgetType]]); //debugln(['TBuildManager.BuildTargetIDEIsDefault NewTargetOS=',NewTargetOS,' Default=',GetDefaultTargetOS,' NewTargetCPU=',NewTargetCPU,' default=',GetDefaultTargetCPU,' ws=',LCLPlatformDisplayNames[NewLCLWidgetSet],' default=',LCLPlatformDisplayNames[GetDefaultLCLWidgetType]]);
Result:=((NewTargetOS='') or (NewTargetOS=GetCompiledTargetOS)) Result:=((NewTargetOS='') or (NewTargetOS=GetCompiledTargetOS))
and ((NewTargetCPU='') or (NewTargetCPU=GetCompiledTargetCPU)) and ((NewTargetCPU='') or (NewTargetCPU=GetCompiledTargetCPU))
and (NewLCLWidgetSet<>lpNoGUI) and (NewLCLWidgetSet<>lpNoGUI);
and (GetCompilerFilename=EnvironmentOptions.GetParsedCompilerFilename); // Note: no need to check if CompilerFilename is the default
end; end;
end. end.