From: Eric Botcazou <ebotcazou@adacore.com>
Date: Sun, 19 Apr 2009 12:46:12 +0000 (+0000)
Subject: gnat.exp (local_find_gnatmake): Pass --LINK to gnatlink.
X-Git-Tag: releases/gcc-4.5.0~6411
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=743e3e4c8c6387b763c6a20e2e577a8df5308b76;p=thirdparty%2Fgcc.git

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 361d93de4dd7..54549213c1bb 100644
--- 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 c14899fe9149..35e18da93d2c 100644
--- 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]
         }