diff options
| author | Jason Merrill <jason@redhat.com> | 2000-08-11 20:48:46 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2000-08-11 20:48:46 -0400 |
| commit | 1fc8c51cd45748fc060df27304d262a3fe2a27d4 (patch) | |
| tree | 951ab629d41875e56102d47f715dc8d9b81c0a25 | |
| parent | e69c807271479a7c4e9efcc0340d24c8832936ee (diff) | |
| download | gcc-1fc8c51cd45748fc060df27304d262a3fe2a27d4.zip gcc-1fc8c51cd45748fc060df27304d262a3fe2a27d4.tar.gz gcc-1fc8c51cd45748fc060df27304d262a3fe2a27d4.tar.bz2 | |
configure.in (CC_FOR_TARGET, [...]): Add -B$$r/gcc/ here.
* configure.in (CC_FOR_TARGET, CHILL_FOR_TARGET,
CXX_FOR_TARGET): Add -B$$r/gcc/ here.
(FLAGS_FOR_TARGET): Not here.
(CHILL_FOR_TARGET, CXX_FOR_TARGET): Don't check the list of languages.
From-SVN: r35651
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.in | 35 |
2 files changed, 10 insertions, 33 deletions
@@ -1,7 +1,9 @@ -2000-08-11 Geoffrey Keating <geoffk@cygnus.com> +2000-08-11 Jason Merrill <jason@redhat.com> - * configure.in (CHILL_FOR_TARGET, CXX_FOR_TARGET): Use slightly more - portable shell script to convert blanks to commas in $LANGUAGES. + * configure.in (CC_FOR_TARGET, CHILL_FOR_TARGET, + CXX_FOR_TARGET): Add -B$$r/gcc/ here. + (FLAGS_FOR_TARGET): Not here. + (CHILL_FOR_TARGET, CXX_FOR_TARGET): Don't check the list of languages. 2000-08-11 Alexandre Oliva <aoliva@redhat.com> diff --git a/configure.in b/configure.in index e119076..9ecd267 100644 --- a/configure.in +++ b/configure.in @@ -1232,15 +1232,6 @@ else fi FLAGS_FOR_TARGET= -if test -d ${topsrcdir}/gcc; then - # Directories specified with -B are searched for libraries after those - # specified with -L, but for headers (in sub-directory `include') - # before those specified with -I and -isystem. Fortunately, we don't - # expect include directories to exist in build_tooldir/{bin,lib} (see - # below), and we want gcc/include to be searched first. - FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -B$$r/gcc/' -fi - case " $skipdirs " in *" target-newlib "*) ;; *) @@ -1282,7 +1273,7 @@ fi if test "x${CC_FOR_TARGET+set}" = xset; then : elif test -d ${topsrcdir}/gcc; then - CC_FOR_TARGET='$$r/gcc/xgcc' + CC_FOR_TARGET='$$r/gcc/xgcc -B$$r/gcc/' elif test "$host" = "$target"; then CC_FOR_TARGET='$(CC)' else @@ -1297,16 +1288,8 @@ esac if test "x${CHILL_FOR_TARGET+set}" = xset; then : -elif test -d ${topsrcdir}/gcc && - # This used to be - # echo ",${enable_languages-`echo ${LANGUAGES-CHILL} | tr ' ' ','`}," - # but that didn't work on the AIX 4.3.3 /bin/sh. - # echo ",${enable_languages-`echo ${LANGUAGES-CHILL} | tr " " ","`}," - # doesn't work on the Solaris 5.6 /bin/sh. - # This works on both: - echo ",${enable_languages-`echo ${LANGUAGES-CHILL} | tr \ ,`}," | - grep ',CHILL,' > /dev/null ; then - CHILL_FOR_TARGET='$$r/gcc/xgcc -L$$r/gcc/ch/runtime/' +elif test -d ${topsrcdir}/gcc; then + CHILL_FOR_TARGET='$$r/gcc/xgcc -B$$r/gcc/ -L$$r/gcc/ch/runtime/' elif test "$host" = "$target"; then CHILL_FOR_TARGET='$(CC)' else @@ -1319,16 +1302,8 @@ esac if test "x${CXX_FOR_TARGET+set}" = xset; then : -elif test -d ${topsrcdir}/gcc && - # This used to be - # echo ",${enable_languages-`echo ${LANGUAGES-c++} | tr ' ' ','`}," - # but that didn't work on the AIX 4.3.3 /bin/sh. - # echo ",${enable_languages-`echo ${LANGUAGES-c++} | tr " " ","`}," - # doesn't work on the Solaris 5.6 /bin/sh. - # This works on both: - echo ",${enable_languages-`echo ${LANGUAGES-c++} | tr \ ,`}," | - grep ',c[+][+],' > /dev/null ; then - CXX_FOR_TARGET='$$r/gcc/g++ -nostdinc++ '$libstdcxx_flags +elif test -d ${topsrcdir}/gcc; then + CXX_FOR_TARGET='$$r/gcc/g++ -B$$r/gcc/ -nostdinc++ '$libstdcxx_flags elif test "$host" = "$target"; then CXX_FOR_TARGET='$(CXX)' else |