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

* link.res is a real linkerscript when we target binutils, not when we

Browse Source 
target the AIX linker
  * never quote file names added to link.res when it's not a linkerscript
    (only newline is a separator in the case)

git-svn-id: trunk@21342 -
This commit is contained in:
Jonas Maebe 2012-05-20 13:30:42 +00:00
parent 90adaeb652
commit ccf895af5a
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
compiler/systems/t_aix.pas
View File

@ -155,7 +155,7 @@ begin
not(cs_link_on_target in current_settings.globalswitches) and not(cs_link_on_target in current_settings.globalswitches) and
not(source_info.system in systems_aix) ; not(source_info.system in systems_aix) ;
{ Open link.res file } { Open link.res file }
LinkRes:=TLinkRes.Create(outputexedir+Info.ResName,not assumebinutils); LinkRes:=TLinkRes.Create(outputexedir+Info.ResName,assumebinutils);
with linkres do with linkres do
begin begin
{ Write path to search libraries } { Write path to search libraries }
@ -181,13 +181,19 @@ begin
if assumebinutils then if assumebinutils then
StartSection('INPUT('); StartSection('INPUT(');
{ add objectfiles, start with prt0 always } { add objectfiles, start with prt0 always }
AddFileName(maybequoted(FindObjectFile(prtobj,'',false))); if assumebinutils then
AddFileName(maybequoted(FindObjectFile(prtobj,'',false)))
else
AddFileName(FindObjectFile(prtobj,'',false));
{ main objectfiles } { main objectfiles }
while not ObjectFiles.Empty do while not ObjectFiles.Empty do
begin begin
s:=ObjectFiles.GetFirst; s:=ObjectFiles.GetFirst;
if s<>'' then if s<>'' then
AddFileName(maybequoted(s)); if assumebinutils then
AddFileName(maybequoted(s))
else
AddFileName(s)
end; end;
{ Write staticlibraries } { Write staticlibraries }
@ -196,7 +202,10 @@ begin
While not StaticLibFiles.Empty do While not StaticLibFiles.Empty do
begin begin
S:=StaticLibFiles.GetFirst; S:=StaticLibFiles.GetFirst;
if assumebinutils then
AddFileName(maybequoted(s)) AddFileName(maybequoted(s))
else
AddFileName(s);
end; end;
end; end;