summaryrefslogtreecommitdiff
path: root/compiler/systems/t_os2.pas
diff options
context:
space:
mode:
Diffstat (limited to 'compiler/systems/t_os2.pas')
-rw-r--r--compiler/systems/t_os2.pas8
1 files changed, 6 insertions, 2 deletions
diff --git a/compiler/systems/t_os2.pas b/compiler/systems/t_os2.pas
index 064169836c..f6d9f4d65b 100644
--- a/compiler/systems/t_os2.pas
+++ b/compiler/systems/t_os2.pas
@@ -396,7 +396,7 @@ begin
with Info do
begin
ExeCmd[1]:='ld $OPT -o $OUT @$RES';
- ExeCmd[2]:='emxbind -b $STRIP $MAP $APPTYPE $RSRC -k$STACKKB -h1 -o $EXE $OUT -ai -s8';
+ ExeCmd[2]:='emxbind -b $STRIP $MAP $APPTYPE $RSRC -k$STACKKB -h1 -q -o $EXE $OUT -ai -s8';
if Source_Info.Script = script_dos then
ExeCmd[3]:='del $OUT';
end;
@@ -533,7 +533,11 @@ begin
Replace(cmdstr,'$RES',maybequoted(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,'$OUT',maybequoted(OutName));
Replace(cmdstr,'$EXE',maybequoted(current_module.exefilename));