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: r146346
This commit is contained in:
Eric Botcazou 2009-04-19 12:47:22 +00:00 committed by Eric Botcazou
parent 779cf49280
commit 191e54ac9f
2 changed files with 10 additions and 5 deletions

View File

@ -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-18 H.J. Lu <hongjiu.lu@intel.com>
Backport from mainline:

View File

@ -255,17 +255,17 @@ 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 == "" } {
set file [lookfor_file $tool_root_dir gcc/gnatmake]
set file [lookfor_file $tool_root_dir gcc/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 root [file dirname $file]
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]
set CC [transform gnatmake]
}
} else {
set CC [transform gnatmake]