Browse Source

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.

git-svn-id: trunk@29753 -
Károly Balogh 10 years ago
parent
commit
c421f4d91e
1 changed files with 2 additions and 2 deletions
  1. 2 2
      compiler/link.pas

+ 2 - 2
compiler/link.pas

@@ -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.ScriptName:=outputexedir+ChangeFileExt(inputfilename,'_script.res');
+            Info.ResName:=ChangeFileExt(inputfilename,'_link.res');
+            Info.ScriptName:=ChangeFileExt(inputfilename,'_script.res');
           end
           end
         else
         else
           begin
           begin