diff options
| author | Rob Savoye <rob.savoye@linaro.org> | 2016-03-28 14:03:39 +1100 |
|---|---|---|
| committer | Ben Elliston <bje@gnu.org> | 2016-03-28 14:03:39 +1100 |
| commit | d8cd1783d80409d2a6258724810023465f331194 (patch) | |
| tree | 8f29a6a674fcc3f2c1f3677fbeac29a4fd66fc85 | |
| parent | 329a811efc1f5a4896e4248f3d031690a15a0aa9 (diff) | |
| download | dejagnu-d8cd1783d80409d2a6258724810023465f331194.zip dejagnu-d8cd1783d80409d2a6258724810023465f331194.tar.gz dejagnu-d8cd1783d80409d2a6258724810023465f331194.tar.bz2 | |
* lib/libgloss.exp (find_g++): Look for xgcc++ to use the freshly
built compiler, then look in the path.
Signed-off-by: Ben Elliston <bje@gnu.org>
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/libgloss.exp | 10 |
2 files changed, 12 insertions, 3 deletions
@@ -1,3 +1,8 @@ +2016-03-28 Rob Savoye <rob.savoye@linaro.org> + + * lib/libgloss.exp (find_g++): Look for xgcc++ to use the freshly + built compiler, then look in the path. + 2016-03-28 Ben Elliston <bje@gnu.org> * lib/utils.exp (which): Don't exclude symbolic links--Debian's diff --git a/lib/libgloss.exp b/lib/libgloss.exp index 0017d05..674a72a 100644 --- a/lib/libgloss.exp +++ b/lib/libgloss.exp @@ -1,5 +1,6 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -# 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, +# 2015, 2016 Free Software Foundation, Inc. # # This file is part of DejaGnu. # @@ -668,9 +669,12 @@ proc find_g++ {} { global tool_root_dir if {![is_remote host]} { - set file [lookfor_file $tool_root_dir g++] + set file [lookfor_file $tool_root_dir xg++] if { $file == "" } { - set file [lookfor_file $tool_root_dir gcc/g++] + set file [lookfor_file $tool_root_dir gcc/xg++] + } + if { $file == "" } { + set file [lookfor_file $tool_root_dir g++] } if { $file != "" } { set CC "$file -B[file dirname $file]/" |