diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 36 |
1 files changed, 5 insertions, 31 deletions
diff --git a/configure.ac b/configure.ac index 6f3d801ab..bec489fc3 100644 --- a/configure.ac +++ b/configure.ac @@ -161,7 +161,6 @@ target_libraries="target-libgcc \ target-libstdc++-v3 \ target-libmudflap \ target-libsanitizer \ - target-libvtv \ target-libssp \ target-libquadmath \ target-libgfortran \ @@ -555,22 +554,6 @@ if test -d ${srcdir}/libsanitizer; then fi fi -# Disable libvtv on unsupported systems. -if test -d ${srcdir}/libvtv; then - if test x$enable_libvtv = x; then - AC_MSG_CHECKING([for libvtv support]) - if (srcdir=${srcdir}/libvtv; \ - . ${srcdir}/configure.tgt; \ - test "$VTV_SUPPORTED" != "yes") - then - AC_MSG_RESULT([no]) - noconfigdirs="$noconfigdirs target-libvtv" - else - AC_MSG_RESULT([yes]) - fi - fi -fi - # Disable libquadmath for some systems. case "${target}" in avr-*-*) @@ -1118,14 +1101,10 @@ case "${target}" in noconfigdirs="$noconfigdirs gprof target-libgloss" ;; mips*-*-bsd*) - noconfigdirs="$noconfigdirs ld gas gprof target-libgloss" + noconfigdirs="$noconfigdirs gprof target-libgloss" ;; mips*-*-linux*) ;; - mips*-*-ultrix* | mips*-*-osf* | mips*-*-ecoff* | mips*-*-pe* \ - | mips*-*-irix* | mips*-*-lnews* | mips*-*-riscos*) - noconfigdirs="$noconfigdirs ld gas gprof" - ;; mips*-*-*) noconfigdirs="$noconfigdirs gprof" ;; @@ -2054,11 +2033,11 @@ case ,${enable_languages},:${enable_objc_gc} in ;; esac -# Disable libitm, libsanitizer, libvtv if we're not building C++ +# Disable libitm and libsanitizer if we're not building C++ case ,${enable_languages}, in *,c++,*) ;; *) - noconfigdirs="$noconfigdirs target-libitm target-libsanitizer target-libvtv" + noconfigdirs="$noconfigdirs target-libitm target-libsanitizer" ;; esac @@ -2484,11 +2463,6 @@ if echo " ${target_configdirs} " | grep " libsanitizer " > /dev/null 2>&1 ; then bootstrap_target_libs=${bootstrap_target_libs}target-libsanitizer, fi -# If we are building libvtv, bootstrap it. -if echo " ${target_configdirs} " | grep " libvtv " > /dev/null 2>&1 ; then - bootstrap_target_libs=${bootstrap_target_libs}target-libvtv, -fi - # Determine whether gdb needs tk/tcl or not. # Use 'maybe' since enable_gdbtk might be true even if tk isn't available # and in that case we want gdb to be built without tk. Ugh! @@ -3185,10 +3159,10 @@ GCC_TARGET_TOOL(as, AS_FOR_TARGET, AS, [gas/as-new]) GCC_TARGET_TOOL(cc, CC_FOR_TARGET, CC, [gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/]) dnl see comments for CXX_FOR_TARGET_FLAG_TO_PASS GCC_TARGET_TOOL(c++, CXX_FOR_TARGET, CXX, - [gcc/xg++ -B$$r/$(HOST_SUBDIR)/gcc/ -nostdinc++ `if test -f $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags; then $(SHELL) $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags --build-includes; else echo -funconfigured-libstdc++-v3 ; fi` -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs], + [gcc/xg++ -B$$r/$(HOST_SUBDIR)/gcc/ -nostdinc++ `if test -f $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags; then $(SHELL) $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags --build-includes; else echo -funconfigured-libstdc++-v3 ; fi` -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs], c++) GCC_TARGET_TOOL(c++ for libstdc++, RAW_CXX_FOR_TARGET, CXX, - [gcc/xgcc -shared-libgcc -B$$r/$(HOST_SUBDIR)/gcc -nostdinc++ -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs], + [gcc/xgcc -shared-libgcc -B$$r/$(HOST_SUBDIR)/gcc -nostdinc++ -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs], c++) GCC_TARGET_TOOL(dlltool, DLLTOOL_FOR_TARGET, DLLTOOL, [binutils/dlltool]) GCC_TARGET_TOOL(gcc, GCC_FOR_TARGET, , [gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/]) |