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

startlazarus: fixed regression, issue #35184, Cyrax

Browse Source 
git-svn-id: trunk@60575 -
This commit is contained in:
mattias 2019-03-04 07:57:40 +00:00
parent 1a22de281f
commit e3b4ad515f
2 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
components/codetools/definetemplates.pas
View File

@ -2008,10 +2008,11 @@ var
FPM: TPCFPMFileState; FPM: TPCFPMFileState;
begin begin
// try to resolve .ppu files via fpmkinst .fpm files // try to resolve .ppu files via fpmkinst .fpm files
FileCount:=0;
UnitToFPM:=TStringToPointerTree.Create(false); UnitToFPM:=TStringToPointerTree.Create(false);
FPMNameToFPM:=TStringToPointerTree.Create(false); FPMNameToFPM:=TStringToPointerTree.Create(false);
FPMNameToFPM.FreeValues:=true; FPMNameToFPM.FreeValues:=true;
if Units=nil then exit;
FileCount:=0;
Abort:=false; Abort:=false;
AVLNode:=Units.Tree.FindLowest; AVLNode:=Units.Tree.FindLowest;
while AVLNode<>nil do begin while AVLNode<>nil do begin
@ -8836,16 +8837,19 @@ begin
RealTargetCPU:=TargetCPU; RealTargetCPU:=TargetCPU;
if RealTargetCPU='' then if RealTargetCPU='' then
RealTargetCPU:=GetCompiledTargetCPU; RealTargetCPU:=GetCompiledTargetCPU;
end; end;
if FullVersion<>'' then begin
// run fpc/pas2js and parse output // run fpc/pas2js and parse output
HasPPUs:=false;
RunFPCVerbose(Compiler,TestFilename,CfgFiles,RealCompiler,UnitPaths, RunFPCVerbose(Compiler,TestFilename,CfgFiles,RealCompiler,UnitPaths,
IncludePaths,UnitScopes,Defines,Undefines,ExtraOptions); IncludePaths,UnitScopes,Defines,Undefines,ExtraOptions);
//debugln(['TPCTargetConfigCache.Update UnitPaths="',UnitPaths.Text,'"']); //debugln(['TPCTargetConfigCache.Update UnitPaths="',UnitPaths.Text,'"']);
//debugln(['TPCTargetConfigCache.Update UnitScopes="',UnitScopes.Text,'"']); //debugln(['TPCTargetConfigCache.Update UnitScopes="',UnitScopes.Text,'"']);
//debugln(['TPCTargetConfigCache.Update IncludePaths="',IncludePaths.Text,'"']); //debugln(['TPCTargetConfigCache.Update IncludePaths="',IncludePaths.Text,'"']);
end;
if Defines<>nil then begin
if Defines.Contains('PAS2JS') and Defines.Contains('PAS2JS_FULLVERSION') then if Defines.Contains('PAS2JS') and Defines.Contains('PAS2JS_FULLVERSION') then
Kind:=pcPas2js Kind:=pcPas2js
else if Defines.Contains('FPC') and Defines.Contains('FPC_FULLVERSION') then else if Defines.Contains('FPC') and Defines.Contains('FPC_FULLVERSION') then
@ -8855,6 +8859,7 @@ begin
if KindErrorMsg<>'' then if KindErrorMsg<>'' then
debugln(['Warning: [TPCTargetConfigCache.Update] cannot determine type of compiler: Compiler="'+Compiler+'" Options="'+ExtraOptions+'"']); debugln(['Warning: [TPCTargetConfigCache.Update] cannot determine type of compiler: Compiler="'+Compiler+'" Options="'+ExtraOptions+'"']);
end; end;
end;
if Kind=pcFPC then if Kind=pcFPC then
RealTargetCPUCompiler:=FindDefaultTargetCPUCompiler(TargetCPU,true); RealTargetCPUCompiler:=FindDefaultTargetCPUCompiler(TargetCPU,true);
PreparePaths(UnitPaths); PreparePaths(UnitPaths);
@ -8896,8 +8901,10 @@ begin
debugln(['Warning: [TPCTargetConfigCache.Update] no unit paths: ',Compiler,' ',ExtraOptions]); debugln(['Warning: [TPCTargetConfigCache.Update] no unit paths: ',Compiler,' ',ExtraOptions]);
end; end;
// check if the system ppu exists // check if the system ppu exists
HasPPUs:=(Kind=pcFPC) and (CompareFileExt(Units['system'],'ppu',false)=0); HasPPUs:=(Kind=pcFPC) and (Units<>nil)
if CTConsoleVerbosity>=-1 then begin and (CompareFileExt(Units['system'],'ppu',false)=0);
// check compiler version define
if (CTConsoleVerbosity>=-1) and (Defines<>nil) then begin
case Kind of case Kind of
pcFPC: pcFPC:
if not Defines.Contains('FPC_FULLVERSION') then if not Defines.Contains('FPC_FULLVERSION') then

2
ide/lazarusmanager.pas
View File

@ -429,8 +429,8 @@ begin
FProcess.Options := []; FProcess.Options := [];
FProcess.ShowWindow := swoShow; FProcess.ShowWindow := swoShow;
Params:=TStringListUTF8.Create; Params:=TStringListUTF8.Create;
Params.Add(LazarusPath);
SplitCmdLineParams(CommandLine,Params); SplitCmdLineParams(CommandLine,Params);
FProcess.Executable:=LazarusPath;
FProcess.Parameters:=Params; FProcess.Parameters:=Params;
Params.Free; Params.Free;
if (EnvOverrides<>nil) and (EnvOverrides.Count>0) then if (EnvOverrides<>nil) and (EnvOverrides.Count>0) then