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

IDE: checking Makefile.compiled: ignore -Cg on Linux

Browse Source 
git-svn-id: trunk@47863 -
This commit is contained in:
mattias 2015-02-17 14:54:04 +00:00
parent b233984952
commit 0910e1bd5b
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packager/packagesystem.pas
View File

@ -446,7 +446,7 @@ var
PackageGraph: TLazPackageGraph = nil; PackageGraph: TLazPackageGraph = nil;
function ExtractFPCParamsForBuildAll(const CompParams: string): string; function ExtractFPCParamsForBuildAll(const CompParams: string): string;
function ExtractSearchPathsFromFPCParams(const CompParams: string; function ExtractMakefileCompiledParams(const CompParams: string;
CreateReduced: boolean = false; CreateReduced: boolean = false;
BaseDir: string = ''; MakeRelative: boolean = false): TStringList; BaseDir: string = ''; MakeRelative: boolean = false): TStringList;
function RemoveFPCVerbosityParams(const CompParams: string): string; function RemoveFPCVerbosityParams(const CompParams: string): string;
@ -507,7 +507,7 @@ begin
Result:=UTF8Trim(Result,[]); Result:=UTF8Trim(Result,[]);
end; end;
function ExtractSearchPathsFromFPCParams(const CompParams: string; function ExtractMakefileCompiledParams(const CompParams: string;
CreateReduced: boolean; BaseDir: string; MakeRelative: boolean): TStringList; CreateReduced: boolean; BaseDir: string; MakeRelative: boolean): TStringList;
var var
AllPaths: TStringList; AllPaths: TStringList;
@ -545,7 +545,7 @@ begin
Path:=copy(CompParams,StartPos+3,EndPos-StartPos-3); Path:=copy(CompParams,StartPos+3,EndPos-StartPos-3);
if (Path<>'') and (Path[1] in ['''','"']) then if (Path<>'') and (Path[1] in ['''','"']) then
Path:=AnsiDequotedStr(Path,Path[1]); Path:=AnsiDequotedStr(Path,Path[1]);
case Reduced[StartPos+2] of case CompParams[StartPos+2] of
'u': begin AddSearchPath('UnitPath'); continue; end; 'u': begin AddSearchPath('UnitPath'); continue; end;
'U': begin AllPaths.Values['UnitOutputDir']:=Path; continue; end; 'U': begin AllPaths.Values['UnitOutputDir']:=Path; continue; end;
'i': begin AddSearchPath('IncPath'); continue; end; 'i': begin AddSearchPath('IncPath'); continue; end;
@ -562,6 +562,15 @@ begin
'B': 'B':
// build clean // build clean
continue; continue;
'C':
if (StartPos+2<=length(CompParams)) and (CompParams[StartPos+2]='g')
and TargetNeedsFPCOptionCG(GetCompiledTargetOS,GetCompiledTargetCPU)
then begin
// the -Cg parameter is added automatically on Linux, but not in the
// Makefile.compiled, because that is platform independent.
// -> ignore
continue;
end;
end; end;
end; end;
if Reduced<>'' then if Reduced<>'' then
@ -3348,8 +3357,9 @@ begin
CurPaths:=nil; CurPaths:=nil;
LastPaths:=nil; LastPaths:=nil;
try try
CurPaths:=ExtractSearchPathsFromFPCParams(CompilerParams,true); CurPaths:=ExtractMakefileCompiledParams(CompilerParams,true);
LastPaths:=ExtractSearchPathsFromFPCParams(LastParams,true); LastPaths:=ExtractMakefileCompiledParams(LastParams,true);
//debugln(['TLazPackageGraph.CheckIfCurPkgOutDirNeedsCompile CompilerParams="',CompilerParams,'" UnitPaths="',CurPaths.Values['UnitPath'],'"']); //debugln(['TLazPackageGraph.CheckIfCurPkgOutDirNeedsCompile CompilerParams="',CompilerParams,'" UnitPaths="',CurPaths.Values['UnitPath'],'"']);
// compare custom options // compare custom options
OldValue:=LastPaths.Values['Reduced']; OldValue:=LastPaths.Values['Reduced'];