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

IDE: compare compiled file: ignore spaces between options

Browse Source 
git-svn-id: branches/fixes_1_4@47862 -
This commit is contained in:
mattias 2015-02-17 13:20:44 +00:00
parent aba7781376
commit 3c53eadb66
2 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ide/compileroptions.pp
View File

@ -647,6 +647,7 @@ function ParseString(Options: TParsedCompilerOptions;
const UnparsedValue: string;
PlatformIndependent: boolean): string;
function GetMakefileMacroValue(const MacroName: string): string;
function TargetNeedsFPCOptionCG(TargetOS, TargetCPU: string): boolean;
procedure GatherInheritedOptions(AddOptionsList: TFPList;
Parsed: TCompilerOptionsParseType;
@ -714,6 +715,13 @@ begin
Result:='';
end;
function TargetNeedsFPCOptionCG(TargetOS, TargetCPU: string): boolean;
begin
Result:= (TargetCPU='x86_64')
and ((TargetOS='linux') or (TargetOS='freebsd') or (TargetOS='netbsd')
or (TargetOS='openbsd') or (TargetOS='solaris'));
end;
procedure GatherInheritedOptions(AddOptionsList: TFPList;
Parsed: TCompilerOptionsParseType;
var InheritedOptionStrings: TInheritedCompOptsStrings);
@ -2812,10 +2820,7 @@ begin
if RelocatableUnit and (CurSrcOS='win') then
switches := switches + ' -WR';
if (not (ccloNoMacroParams in Flags))
and (CurTargetCPU='x86_64')
and ((CurTargetOS='linux') or (CurTargetOS='freebsd') or (CurTargetOS='netbsd')
or (CurTargetOS='openbsd') or (CurTargetOS='solaris'))
then
and TargetNeedsFPCOptionCG(CurTargetOS,CurTargetCPU) then
switches := switches + ' -Cg'; // see bug 17412
{ Checks }

35
packager/packagesystem.pas
View File

@ -533,39 +533,40 @@ var
begin
Result:=TStringList.Create;
Reduced:=CompParams;
Reduced:='';
AllPaths:=Result;
EndPos:=1;
while ReadNextFPCParameter(Reduced,EndPos,StartPos) do begin
if (Reduced[StartPos]='-') and (StartPos<length(Reduced)) then begin
case Reduced[StartPos+1] of
while ReadNextFPCParameter(CompParams,EndPos,StartPos) do begin
if (CompParams[StartPos]='-') and (StartPos<length(CompParams)) then begin
case CompParams[StartPos+1] of
'F':
// search paths
if StartPos<length(Reduced)-1 then begin
Path:=copy(Reduced,StartPos+3,EndPos-StartPos-3);
if StartPos<length(CompParams)-1 then begin
Path:=copy(CompParams,StartPos+3,EndPos-StartPos-3);
if (Path<>'') and (Path[1] in ['''','"']) then
Path:=AnsiDequotedStr(Path,Path[1]);
case Reduced[StartPos+2] of
'u': AddSearchPath('UnitPath');
'U': AllPaths.Values['UnitOutputDir']:=Path;
'i': AddSearchPath('IncPath');
'o': AddSearchPath('ObjectPath');
'l': AddSearchPath('LibPath');
else continue;
'u': begin AddSearchPath('UnitPath'); continue; end;
'U': begin AllPaths.Values['UnitOutputDir']:=Path; continue; end;
'i': begin AddSearchPath('IncPath'); continue; end;
'o': begin AddSearchPath('ObjectPath'); continue; end;
'l': begin AddSearchPath('LibPath'); continue; end;
end;
DeleteOption;
end;
'v':
// verbosity
DeleteOption;
continue;
'i','l':
// information
DeleteOption;
continue;
'B':
// build clean
DeleteOption;
continue;
end;
end;
if Reduced<>'' then
Reduced+=' ';
Reduced+=copy(CompParams,StartPos,EndPos-StartPos);
end;
if BaseDir<>'' then begin
for i:=0 to AllPaths.Count-1 do begin
@ -2970,8 +2971,6 @@ begin
stats^.CompilerFilename:=StringReplace(stats^.CompilerFilename,'%(','$(',[rfReplaceAll]);
stats^.Params:=StringReplace(stats^.Params,'%(','$(',[rfReplaceAll]);
end;
end;
if stats^.ViaMakefile then begin
ForcePathDelims(stats^.CompilerFilename);
ForcePathDelims(stats^.Params);
end;