Browse Source

* missing utilsprefix added

Tomas Hajny 20 years ago
parent
commit
bdeab14b7f
2 changed files with 14 additions and 6 deletions
  1. 7 3
      compiler/systems/t_emx.pas
  2. 7 3
      compiler/systems/t_os2.pas

+ 7 - 3
compiler/systems/t_emx.pas

@@ -362,7 +362,8 @@ begin
    begin
    begin
      ExeCmd[1]:='ld $OPT -o $OUT @$RES';
      ExeCmd[1]:='ld $OPT -o $OUT @$RES';
      ExeCmd[2]:='emxbind -b $STRIP $APPTYPE $RSRC -k$STACKKB -h$HEAPMB -o $EXE $OUT -aim -s$DOSHEAPKB';
      ExeCmd[2]:='emxbind -b $STRIP $APPTYPE $RSRC -k$STACKKB -h$HEAPMB -o $EXE $OUT -aim -s$DOSHEAPKB';
-     ExeCmd[3]:='del $OUT';
+     if source_info.script = script_dos then
+      ExeCmd[3]:='del $OUT';
    end;
    end;
 end;
 end;
 
 
@@ -490,7 +491,7 @@ begin
         Replace(cmdstr,'$OUT',maybequoted(OutName));
         Replace(cmdstr,'$OUT',maybequoted(OutName));
         Replace(cmdstr,'$EXE',maybequoted(current_module.exefilename^));
         Replace(cmdstr,'$EXE',maybequoted(current_module.exefilename^));
         if i<>3 then
         if i<>3 then
-         success:=DoExec(FindUtil(binstr),cmdstr,(i=1),false)
+         success:=DoExec(FindUtil(utilsprefix+binstr),cmdstr,(i=1),false)
         else
         else
          success:=DoExec(binstr,cmdstr,(i=1),true);
          success:=DoExec(binstr,cmdstr,(i=1),true);
       end;
       end;
@@ -516,7 +517,10 @@ initialization
 end.
 end.
 {
 {
   $Log$
   $Log$
-  Revision 1.13  2004-12-22 16:32:45  peter
+  Revision 1.14  2004-12-30 17:41:28  hajny
+    * missing utilsprefix added
+
+  Revision 1.13  2004/12/22 16:32:45  peter
     * maybequoted() added
     * maybequoted() added
 
 
   Revision 1.12  2004/12/05 12:25:48  hajny
   Revision 1.12  2004/12/05 12:25:48  hajny

+ 7 - 3
compiler/systems/t_os2.pas

@@ -362,7 +362,8 @@ begin
    begin
    begin
      ExeCmd[1]:='ld $OPT -o $OUT @$RES';
      ExeCmd[1]:='ld $OPT -o $OUT @$RES';
      ExeCmd[2]:='emxbind -b $STRIP $APPTYPE $RSRC -k$STACKKB -h$HEAPMB -o $EXE $OUT -aim -s$DOSHEAPKB';
      ExeCmd[2]:='emxbind -b $STRIP $APPTYPE $RSRC -k$STACKKB -h$HEAPMB -o $EXE $OUT -aim -s$DOSHEAPKB';
-     ExeCmd[3]:='del $OUT';
+     if Source_Info.Script = script_dos then
+      ExeCmd[3]:='del $OUT';
    end;
    end;
 end;
 end;
 
 
@@ -490,7 +491,7 @@ begin
         Replace(cmdstr,'$OUT',maybequoted(OutName));
         Replace(cmdstr,'$OUT',maybequoted(OutName));
         Replace(cmdstr,'$EXE',maybequoted(current_module.exefilename^));
         Replace(cmdstr,'$EXE',maybequoted(current_module.exefilename^));
         if i<>3 then
         if i<>3 then
-         success:=DoExec(FindUtil(binstr),cmdstr,(i=1),false)
+         success:=DoExec(FindUtil(utilsprefix+binstr),cmdstr,(i=1),false)
         else
         else
          success:=DoExec(binstr,cmdstr,(i=1),true);
          success:=DoExec(binstr,cmdstr,(i=1),true);
       end;
       end;
@@ -516,7 +517,10 @@ initialization
 end.
 end.
 {
 {
   $Log$
   $Log$
-  Revision 1.18  2004-12-28 20:39:12  hajny
+  Revision 1.19  2004-12-30 17:41:27  hajny
+    * missing utilsprefix added
+
+  Revision 1.18  2004/12/28 20:39:12  hajny
     * don't put quoted paths in link.res for OS/2
     * don't put quoted paths in link.res for OS/2
 
 
   Revision 1.17  2004/12/22 16:32:46  peter
   Revision 1.17  2004/12/22 16:32:46  peter