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

codetools: if fpc.exe omits last line with realcompiler, use compile in path

Browse Source 
git-svn-id: branches/fixes_2_0@63081 -
This commit is contained in:
mattias 2020-04-25 19:16:32 +00:00
parent 61a860026f
commit a248f9b253
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/codetools/definetemplates.pas
View File

@ -1480,6 +1480,7 @@ begin
//debugln(['RunTool Last=',OutputLine]);
if OutputLine<>'' then
Result.Add(OutputLine);
//debugln(['RunTool Result=',Result[Result.Count-1]]);
TheProcess.WaitOnExit;
finally
TheProcess.Free;
@ -1665,7 +1666,6 @@ function ParseFPCVerbose(List: TStrings; const WorkDir: string; out
Filename: String;
p: SizeInt;
begin
//DebugLn(['ProcessOutputLine ',Line]);
Line:=SysToUtf8(Line);
len := length(Line);
if len <= 6 then Exit; // shortest match
@ -8629,14 +8629,16 @@ begin
debugln(['Warning: [TPCTargetConfigCache.Update] cannot determine type of compiler: Compiler="'+Compiler+'" Options="'+ExtraOptions+'"']);
end;
end;
if Kind=pcFPC then
if Kind=pcFPC then begin
RealTargetCPUCompiler:=FindDefaultTargetCPUCompiler(TargetCPU,true);
if RealCompiler='' then RealCompiler:=RealTargetCPUCompiler;
end;
PreparePaths(UnitPaths);
PreparePaths(IncludePaths);
// store the real compiler file and date
if (RealCompiler<>'') and FileExistsCached(RealCompiler) then begin
RealCompilerDate:=FileAgeCached(RealCompiler);
end else if Kind=pcFPC then begin
if (RealCompiler<>'') and FileExistsCached(RealCompiler) then
RealCompilerDate:=FileAgeCached(RealCompiler)
else if Kind=pcFPC then begin
if CTConsoleVerbosity>=-1 then
debugln(['Warning: [TPCTargetConfigCache.Update] cannot find real compiler for this platform: Compiler="'+Compiler+'" Options="'+ExtraOptions+'" RealCompiler="',RealCompiler,'"']);
end;