From 7a53e94bc899e50b7fc61ad9acbc3ce18c4607e7 Mon Sep 17 00:00:00 2001 From: Mark Mitchell Date: Mon, 24 Jan 2000 21:02:27 +0000 Subject: Makefile.in (CXX_FOR_TARGET): Use g++, not xgcc, to invoke the C++ compiler. * Makefile.in (CXX_FOR_TARGET): Use g++, not xgcc, to invoke the C++ compiler. * lib/g++.exp (g++init): Use g++, not xgcc, to invoke the C++ compiler. (tool_option_proc): Fix typo. From-SVN: r31593 --- gcc/testsuite/ChangeLog | 6 ++++++ gcc/testsuite/lib/g++.exp | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'gcc') diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 4d1c305..1ec2bc1 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2000-01-24 Mark Mitchell + + * lib/g++.exp (g++init): Use g++, not xgcc, to invoke the C++ + compiler. + (tool_option_proc): Fix typo. + 2000-01-24 Geoff Keating * gcc.dg/special/ecos.exp (gcsec-1.c): Check the version diff --git a/gcc/testsuite/lib/g++.exp b/gcc/testsuite/lib/g++.exp index 0cc681f..720cd43 100644 --- a/gcc/testsuite/lib/g++.exp +++ b/gcc/testsuite/lib/g++.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 2000 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -85,7 +85,7 @@ proc g++_init { args } { if [is_remote host] { set GXX_UNDER_TEST [transform c++] } else { - set GXX_UNDER_TEST [findfile $base_dir/../xgcc "$base_dir/../xgcc -B$base_dir/../" [findfile $base_dir/xgcc "$base_dir/xgcc -B$base_dir/" [transform c++]]] + set GXX_UNDER_TEST [findfile $base_dir/../g++ "$base_dir/../g++ -B$base_dir/../" [findfile $base_dir/g++ "$base_dir/g++ -B$base_dir/" [transform c++]]] } } } @@ -97,7 +97,7 @@ proc g++_init { args } { if ![is_remote host] { if { [which $GXX_UNDER_TEST] == 0 } then { - perror "GXX_UNDER_TEST does not exist" + perror "GXX_UNDER_TEST ($GXX_UNDER_TEST) does not exist" exit 1 } } @@ -221,7 +221,7 @@ proc ${tool}_option_help { } { } proc ${tool}_option_proc { option } { - if[regexp "^--additional_options," $option] { + if [regexp "^--additional_options," $option] { global gpp_compile_options regsub "--additional_options," $option "" option foreach x [split $option ","] { -- cgit v1.1