From: Tom Tromey <tom@tromey.com>
Date: Mon, 4 Sep 2017 05:15:03 +0000 (-0600)
Subject: Don't use -fdiagnostics-color=never for rustc
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5eb5f850;p=binutils-gdb.git

Don't use -fdiagnostics-color=never for rustc

I noticed that the gdb.rust tests fail because the test suite passes
-fdiagnostics-color=never to rustc.  This is not a recognized rustc
option, and the test suite already handles passing the appropriate
option to the Rust compiler.

This patch fixes the problem.

testsuite/ChangeLog
2017-09-05  Tom Tromey  <tom@tromey.com>

	* lib/gdb.exp (gdb_compile): Don't use universal_compile_options
	for rust.
---

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index dfb63a3fa04..b3bed5ce98a 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-09-05  Tom Tromey  <tom@tromey.com>
+
+	* lib/gdb.exp (gdb_compile): Don't use universal_compile_options
+	for rust.
+
 2017-09-05  Simon Marchi  <simon.marchi@ericsson.com>
 
 	* gdb.multi/multi-arch-exec.exp: Test with different
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index c0ecab31ffc..8af1b77d32c 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -3447,7 +3447,12 @@ proc gdb_compile {source dest type options} {
 
     # Add platform-specific options if a shared library was specified using
     # "shlib=librarypath" in OPTIONS.
-    set new_options [universal_compile_options]
+    if {[lsearch -exact $options rust] != -1} {
+	# -fdiagnostics-color is not a rustcc option.
+    } else {
+	set new_options [universal_compile_options]
+    }
+    set new_options {}
     set shlib_found 0
     set shlib_load 0
     foreach opt $options {