浏览代码

* hack fixing the issue with incorrect name of OS/2 import libraries (to avoid merging r12727 from trunk)

git-svn-id: branches/fixes_2_2@12831 -
Tomas Hajny 16 年之前
父节点
当前提交
a721f007ed
共有 1 个文件被更改,包括 5 次插入2 次删除
  1. 5 2
      compiler/systems/t_os2.pas

+ 5 - 2
compiler/systems/t_os2.pas

@@ -358,10 +358,13 @@ end;
           ImportLibrary : TImportLibrary;
           ImportSymbol  : TImportSymbol;
       begin
-        LibName:=FixFileName(Current_Module.RealModuleName^ + Target_Info.StaticCLibExt);
+{        LibName:=FixFileName(Current_Module.ModuleName^ + Target_Info.StaticCLibExt);}
+(* Hack to fix the problem without merging larger changes from trunk. *)
+        LibName := FixFileName(Current_Module.ObjFileName^);
+        LibName := Copy (LibName, 1, Length (LibName) - Length (Target_Info.ObjExt)) + Target_Info.StaticLibExt;
         seq_no:=1;
         current_module.linkotherstaticlibs.add(libname,link_always);
-        assign(out_file,current_module.outputpath^+libname);
+        assign(out_file,libname);
         rewrite(out_file,1);
         blockwrite(out_file,ar_magic,sizeof(ar_magic));