瀏覽代碼

* fix missing space when passing additional parameters to the EMX linker

git-svn-id: trunk@28999 -
Tomas Hajny 10 年之前
父節點
當前提交
a593cc2def
共有 1 個文件被更改,包括 5 次插入1 次删除
  1. 5 1
      compiler/systems/t_os2.pas

+ 5 - 1
compiler/systems/t_os2.pas

@@ -533,7 +533,11 @@ begin
         Replace(cmdstr,'$RES',maybequoted(outputexedir+Info.ResName));
         Replace(cmdstr,'$RES',maybequoted(outputexedir+Info.ResName));
 *)
 *)
         Replace(cmdstr,'$RES',outputexedir+Info.ResName);
         Replace(cmdstr,'$RES',outputexedir+Info.ResName);
-        Replace(cmdstr,'$OPT ',Info.ExtraOptions);
+        if (Info.ExtraOptions <> '') and
+                   (Info.ExtraOptions [Length (Info.ExtraOptions)] <> ' ') then
+         Replace(cmdstr,'$OPT',Info.ExtraOptions)
+        else
+         Replace(cmdstr,'$OPT ',Info.ExtraOptions);
         Replace(cmdstr,'$RSRC ',RsrcStr);
         Replace(cmdstr,'$RSRC ',RsrcStr);
         Replace(cmdstr,'$OUT',maybequoted(OutName));
         Replace(cmdstr,'$OUT',maybequoted(OutName));
         Replace(cmdstr,'$EXE',maybequoted(current_module.exefilename));
         Replace(cmdstr,'$EXE',maybequoted(current_module.exefilename));