Browse Source

AROS: use collect-aros to link. also support binutils prefixes.

git-svn-id: trunk@28443 -
Károly Balogh 11 years ago
parent
commit
2f086129e1
1 changed files with 4 additions and 2 deletions
  1. 4 2
      compiler/systems/t_aros.pas

+ 4 - 2
compiler/systems/t_aros.pas

@@ -89,8 +89,8 @@ end;
 procedure TLinkeraros.Setaros386Info;
 begin
   with Info do begin
-    //ExeCmd[1]:='collect-aros $OPT -d -n -o $EXE $RES';
-    ExeCmd[1]:='i386-aros-ld $OPT -d -n -o $EXE $RES';
+    ExeCmd[1]:='collect-aros $OPT -d -n -o $EXE $RES';
+    //ExeCmd[1]:='i386-aros-ld $OPT -d -n -o $EXE $RES';
   end;
 end;
 
@@ -227,6 +227,7 @@ begin
 
   { Call linker }
   SplitBinCmd(Info.ExeCmd[1],BinStr,CmdStr);
+  binstr:=FindUtil(utilsprefix+BinStr);
   Replace(cmdstr,'$OPT',Info.ExtraOptions);
   Replace(cmdstr,'$EXE',maybequoted(ScriptFixFileName(current_module.exefilename)));
   Replace(cmdstr,'$RES',maybequoted(ScriptFixFileName(outputexedir+Info.ResName)));
@@ -249,6 +250,7 @@ begin
 
   { Call linker }
   SplitBinCmd(Info.ExeCmd[1],BinStr,CmdStr);
+  binstr:=FindUtil(utilsprefix+BinStr);
   Replace(cmdstr,'$OPT',Info.ExtraOptions);
   Replace(cmdstr,'$EXE',Unix2AmigaPath(maybequoted(ScriptFixFileName(current_module.exefilename))));
   Replace(cmdstr,'$RES',Unix2AmigaPath(maybequoted(ScriptFixFileName(outputexedir+Info.ResName))));