paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-22 05:39:44 +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: branches/fixes_2_0@62023 -
This commit is contained in:
mattias 2019-10-10 12:32:52 +00:00
parent e3c3808c90
commit 360d9bb7a4
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

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