FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Makefile.in (CXX_FOR_TARGET): Use g++, not xgcc, to invoke the C++ compiler.

Browse source 
* 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
This commit is contained in:
Mark Mitchell 2000-01-24 21:02:27 +00:00 • committed by Mark Mitchell
parent 360f2326ea
commit 7a53e94bc8
4 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2000-01-24 Mark Mitchell <mark@codesourcery.com>
* Makefile.in (CXX_FOR_TARGET): Use g++, not xgcc, to invoke
the C++ compiler.
Wed Jan 12 18:00:26 2000 Mark P. Mitchell <mark@codesourcery.com>
* configure.in: Fix typo in last change.

8
Makefile.in
View file

@ -247,15 +247,15 @@ CHILL_FOR_TARGET = ` \
fi`
CXX_FOR_TARGET = ` \
if [ -f $$r/gcc/xgcc ] ; then \
if [ -f $$r/gcc/g++ ] ; then \
if [ -f $$r/$(TARGET_SUBDIR)/newlib/Makefile ] ; then \
if [ -f $$r/$(TARGET_SUBDIR)/winsup/Makefile ] ; then \
echo $$r/gcc/xgcc -B$$r/gcc/ -B$$r/$(TARGET_SUBDIR)/newlib/ -B$(build_tooldir)/bin/ -L$$r/winsup -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \
echo $$r/gcc/g++ -B$$r/gcc/ -B$$r/$(TARGET_SUBDIR)/newlib/ -B$(build_tooldir)/bin/ -L$$r/winsup -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \
else \
echo $$r/gcc/xgcc -B$$r/gcc/ -B$(build_tooldir)/bin/ -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \
echo $$r/gcc/g++ -B$$r/gcc/ -B$(build_tooldir)/bin/ -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \
fi; \
else \
echo $$r/gcc/xgcc -B$$r/gcc/ -B$(build_tooldir)/bin/; \
echo $$r/gcc/g++ -B$$r/gcc/ -B$(build_tooldir)/bin/; \
fi; \
else \
if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \

6
gcc/testsuite/ChangeLog
View file

@ -1,3 +1,9 @@
2000-01-24 Mark Mitchell <mark@codesourcery.com>
* lib/g++.exp (g++init): Use g++, not xgcc, to invoke the C++
compiler.
(tool_option_proc): Fix typo.
2000-01-24 Geoff Keating <geoffk@cygnus.com>
* gcc.dg/special/ecos.exp (gcsec-1.c): Check the version

8
gcc/testsuite/lib/g++.exp
View file

@ -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 ","] {