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

do not include outputexedir in linker resname. it causes the path to be double-included when cross-compiling with -st and -FE on Liunuxes. also, be consistent between linking on host and target.

Browse Source 
git-svn-id: trunk@29753 -
This commit is contained in:
Károly Balogh 2015-02-18 14:09:15 +00:00
parent 6ce8aeed27
commit c421f4d91e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/link.pas
View File

@ -620,8 +620,8 @@ Implementation
FillChar(Info,sizeof(Info),0); FillChar(Info,sizeof(Info),0);
if cs_link_on_target in current_settings.globalswitches then if cs_link_on_target in current_settings.globalswitches then
begin begin
Info.ResName:=outputexedir+ChangeFileExt(inputfilename,'_link.res'); Info.ResName:=ChangeFileExt(inputfilename,'_link.res');
Info.ScriptName:=outputexedir+ChangeFileExt(inputfilename,'_script.res'); Info.ScriptName:=ChangeFileExt(inputfilename,'_script.res');
end end
else else
begin begin