diff options
| author | cvs2svn <> | 2002-03-11 00:01:12 +0000 |
|---|---|---|
| committer | cvs2svn <> | 2002-03-11 00:01:12 +0000 |
| commit | 24d0ef8fa9054f81b2280bbb206a673c1959f4cb (patch) | |
| tree | 79ad3fe4c8aeea7f45709e2d6e3da35bd8d30d9b /configure.in | |
| parent | 34124a07180b9c8c7479517436c49292cfd12dcd (diff) | |
| download | cygnal-24d0ef8fa9054f81b2280bbb206a673c1959f4cb.tar.gz cygnal-24d0ef8fa9054f81b2280bbb206a673c1959f4cb.tar.bz2 cygnal-24d0ef8fa9054f81b2280bbb206a673c1959f4cb.zip | |
This commit was manufactured by cvs2svn to create branch 'gdb_5_2-branch'.
Sprout from binutils-2_12-branch 2002-02-09 22:54:17 UTC cvs2svn 'This commit was manufactured by cvs2svn to create branch 'binutils-'
Cherrypick from master 2002-03-01 00:52:59 UTC Alexandre Oliva <aoliva@redhat.com> '* configure.in (libstdcxx_flags): Don't add libstdc++-v3 flags for':
ChangeLog
Makefile.in
config.guess
config.sub
configure.in
etc/ChangeLog
etc/fdl.texi
etc/make-stds.texi
etc/standards.texi
include/ChangeLog
include/bfdlink.h
include/elf/ChangeLog
include/elf/m68k.h
include/elf/ppc.h
include/opcode/ChangeLog
include/opcode/i386.h
include/opcode/ppc.h
include/splay-tree.h
texinfo/texinfo.tex
Cherrypick from master 2002-03-11 00:01:11 UTC Daniel Jacobowitz <drow@false.org> 'gdb/:':
include/gdb/ChangeLog
include/gdb/signals.h
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/configure.in b/configure.in index c533c442b..baf9d73eb 100644 --- a/configure.in +++ b/configure.in @@ -47,15 +47,9 @@ if [ "${enable_gdbgui}" = "yes" ] ; then host_libs="${host_libs} libgui" fi -# Set up configure/Makefile variables if libstdc++-v3 is to be built. -if [ "${enable_libstdcxx_v3}" = "yes" ] && test -d $srcdir/libstdc++-v3; then - libstdcxx_version="target-libstdc++-v3" - # Don't use libstdc++-v3's flags to configure/build itself. - libstdcxx_flags='`case $$dir in libstdc++-v3) ;; *) cat $$r/$(TARGET_SUBDIR)/libstdc++-v3/src/libstdc++.INC 2>/dev/null || : ;; esac` -L$$r/$(TARGET_SUBDIR)/libstd++-v3/src -L$$r/$(TARGET_SUBDIR)/libstd++-v3/src/.libs' -else - libstdcxx_version="target-libio target-libstdc++" - libstdcxx_flags='-isystem $$s/libstdc++ -isystem $$s/libstdc++/std -isystem $$s/libstdc++/stl -isystem $$s/libio/ -isystem $$s/libio/stdio -L$$r/$(TARGET_SUBDIR)/libstdc++' -fi +libstdcxx_version="target-libstdc++-v3" +# Don't use libstdc++-v3's flags to configure/build itself. +libstdcxx_flags='`case $$dir in libstdc++-v3 | libjava) ;; *) test ! -f $$r/$(TARGET_SUBDIR)/libstdc++-v3/testsuite_flags || $(SHELL) $$r/$(TARGET_SUBDIR)/libstdc++-v3/testsuite_flags --build-includes;; esac` -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs' # these tools are built for the host environment # Note, the powerpc-eabi build depends on sim occurring before gdb in order to @@ -1443,7 +1437,10 @@ esac if test "x${CXX_FOR_TARGET+set}" = xset; then : elif test -d ${topsrcdir}/gcc; then - CXX_FOR_TARGET='$$r/gcc/`case $$dir in libstdc++-v3) echo xgcc ;; *) echo g++ ;; esac` -B$$r/gcc/ -nostdinc++ '$libstdcxx_flags + # We add -shared-libgcc to CXX_FOR_TARGET whenever we use xgcc instead + # of g++ for linking C++ or Java, because g++ has -shared-libgcc by + # default whereas gcc does not. + CXX_FOR_TARGET='$$r/gcc/`case $$dir in libstdc++-v3 | libjava) echo xgcc -shared-libgcc ;; *) echo g++ ;; esac` -B$$r/gcc/ -nostdinc++ '$libstdcxx_flags elif test "$host" = "$target"; then CXX_FOR_TARGET='$(CXX)' else |