gnat.exp (local_find_gnatmake): Pass --LINK to gnatlink.

	* lib/gnat.exp (local_find_gnatmake): Pass --LINK to gnatlink.
	Do not pass -B$root after -margs.

From-SVN: r146345

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 361d93de4dd7c17309f653b6ee30804d7f3056cd..54549213c1bb25875f989a708745a27f479080a8 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-19  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * lib/gnat.exp (local_find_gnatmake): Pass --LINK to gnatlink.
+       Do not pass -B$root after -margs.
+
 2009-04-19  Manuel López-Ibáñez  <manu@gcc.gnu.org>
 
        PR c/32061

diff --git a/gcc/testsuite/lib/gnat.exp b/gcc/testsuite/lib/gnat.exp
index c14899fe914961caa2f7ef0cf8e352cd2a18c01e..35e18da93d2caf916e3e9a0ade68bec99f4e49aa 100644 (file)
--- a/gcc/testsuite/lib/gnat.exp
+++ b/gcc/testsuite/lib/gnat.exp
@@ -255,7 +255,7 @@ proc prune_gnat_output { text } {
 
 proc local_find_gnatmake {} {
     global tool_root_dir
-    
+
     if ![is_remote host] {
         set file [lookfor_file $tool_root_dir gnatmake]
         if { $file == "" } {
@@ -263,7 +263,7 @@ proc local_find_gnatmake {} {
         }
         if { $file != "" } {
        set root [file dirname $file]
-       set CC "$file --GCC=$root/xgcc --GNATBIND=$root/gnatbind --GNATLINK=$root/gnatlink -cargs -B$root -largs -B$root -margs -B$root";
+       set CC "$file --GCC=$root/xgcc --GNATBIND=$root/gnatbind --GNATLINK=$root/gnatlink -cargs -B$root -largs --LINK=$root/xgcc -B$root -margs";
         } else {
        set CC [transform gnatmake]
         }