From: Rob Savoye <rob.savoye@linaro.org>
Date: Mon, 28 Mar 2016 03:03:39 +0000 (+1100)
Subject: 	* lib/libgloss.exp (find_g++): Look for xgcc++ to use the freshly
X-Git-Tag: upstream/1.6.2~114
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d8cd1783d80409d2a6258724810023465f331194;p=platform%2Fupstream%2Fdejagnu.git

	* 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>
---

diff --git a/ChangeLog b/ChangeLog
index f5432bc..2eb5770 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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]/"