diff options
| author | jonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2015-01-21 23:28:34 +0000 |
|---|---|---|
| committer | jonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2015-01-21 23:28:34 +0000 |
| commit | 1903b037de2fb3e75826406b46f055acb70963fa (patch) | |
| tree | 604cd8b790fe14e5fbe441d4cd647c80d2a36a9a /compiler/systems/t_os2.pas | |
| parent | ad1141d52f8353457053b925cd674fe1d5c4eafc (diff) | |
| parent | 953d907e4d6c3a5c2f8aaee6e5e4f73c55ce5985 (diff) | |
| download | fpc-blocks.tar.gz | |
* synchronised with trunk till r29513blocks
git-svn-id: http://svn.freepascal.org/svn/fpc/branches/blocks@29516 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'compiler/systems/t_os2.pas')
| -rw-r--r-- | compiler/systems/t_os2.pas | 8 |
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)); |