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

IDE: fixed adding inherited linker options when project has no linker options

Browse Source 
git-svn-id: trunk@29170 -
This commit is contained in:
mattias 2011-01-23 13:21:14 +00:00
parent 29239bd9ba
commit 2f12e1996f
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ide/compileroptions.pp
View File

@ -2582,15 +2582,20 @@ begin
// additional Linker options
if PassLinkerOptions and (not (ccloNoLinkerOpts in Flags))
and (not (ccloNoMacroParams in Flags)) then begin
CurLinkerOptions:=ParsedOpts.GetParsedValue(pcosLinkerOptions);
if (CurLinkerOptions<>'') then
switches := switches + ' ' + ConvertOptionsToCmdLine(' ','-k', CurLinkerOptions);
if (not (ccloNoLinkerOpts in Flags))
and (not (ccloNoMacroParams in Flags)) then
begin
if PassLinkerOptions then
begin
CurLinkerOptions:=ParsedOpts.GetParsedValue(pcosLinkerOptions);
if (CurLinkerOptions<>'') then
switches := switches + ' ' + ConvertOptionsToCmdLine(' ','-k', CurLinkerOptions);
end;
// inherited Linker options
InhLinkerOpts:=GetInheritedOption(icoLinkerOptions,
not (ccloAbsolutePaths in Flags),coptParsed);
not (ccloAbsolutePaths in Flags),coptParsed);
//debugln(['TBaseCompilerOptions.MakeOptionsString InhLinkerOpts="',InhLinkerOpts,'"']);
if InhLinkerOpts<>'' then
switches := switches + ' ' + ConvertOptionsToCmdLine(' ','-k', InhLinkerOpts);