* lib/gdb.exp (build_executable): Forward "c++" option to

	get_compiler_info.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 1332407..183b277 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2010-07-30  Doug Evans  <dje@google.com>
 
+       * lib/gdb.exp (build_executable): Forward "c++" option to
+       get_compiler_info.
+
        * gdb.python/py-type.exp (test_template): Mark as xfail tests
        "python print ttype.template_argument(1)" and
        "python print isinstance(ttype.template_argument(1), gdb.Value)"

diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 04e00e2..ce179b2 100644 (file)
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -3257,7 +3257,11 @@ proc build_executable { testname executable {sources ""} {options {debug}} } {
         return -1
     }
 
-    if [get_compiler_info ${binfile}] {
+    set info_options ""
+    if { [lsearch -exact $options "c++"] >= 0 } {
+       set info_options "c++"
+    }
+    if [get_compiler_info ${binfile} ${info_options}] {
         return -1
     }
     return 0