2013-08-12 Jan-Benedict Glaw <jbglaw@lug-owl.de>
* configure.ac: Sync with GCC repo. * Makefile.def: Ditto. * configure: Regenerate. * Makefile.in: Ditto.
This commit is contained in:
33
configure
vendored
33
configure
vendored
@@ -2774,6 +2774,7 @@ target_libraries="target-libgcc \
|
||||
target-libstdc++-v3 \
|
||||
target-libmudflap \
|
||||
target-libsanitizer \
|
||||
target-libvtv \
|
||||
target-libssp \
|
||||
target-libquadmath \
|
||||
target-libgfortran \
|
||||
@@ -3215,6 +3216,25 @@ $as_echo "yes" >&6; }
|
||||
fi
|
||||
fi
|
||||
|
||||
# Disable libvtv on unsupported systems.
|
||||
if test -d ${srcdir}/libvtv; then
|
||||
if test x$enable_libvtv = x; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libvtv support" >&5
|
||||
$as_echo_n "checking for libvtv support... " >&6; }
|
||||
if (srcdir=${srcdir}/libvtv; \
|
||||
. ${srcdir}/configure.tgt; \
|
||||
test "$VTV_SUPPORTED" != "yes")
|
||||
then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
noconfigdirs="$noconfigdirs target-libvtv"
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
# Disable libquadmath for some systems.
|
||||
case "${target}" in
|
||||
avr-*-*)
|
||||
@@ -6551,11 +6571,11 @@ case ,${enable_languages},:${enable_objc_gc} in
|
||||
;;
|
||||
esac
|
||||
|
||||
# Disable libitm and libsanitizer if we're not building C++
|
||||
# Disable libitm, libsanitizer, libvtv if we're not building C++
|
||||
case ,${enable_languages}, in
|
||||
*,c++,*) ;;
|
||||
*)
|
||||
noconfigdirs="$noconfigdirs target-libitm target-libsanitizer"
|
||||
noconfigdirs="$noconfigdirs target-libitm target-libsanitizer target-libvtv"
|
||||
;;
|
||||
esac
|
||||
|
||||
@@ -7032,6 +7052,11 @@ 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!
|
||||
@@ -13747,7 +13772,7 @@ else
|
||||
esac
|
||||
if test $ok = yes; then
|
||||
# An in-tree tool is available and we can use it
|
||||
CXX_FOR_TARGET='$$r/$(HOST_SUBDIR)/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'
|
||||
CXX_FOR_TARGET='$$r/$(HOST_SUBDIR)/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'
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: just compiled" >&5
|
||||
$as_echo "just compiled" >&6; }
|
||||
elif expr "x$CXX_FOR_TARGET" : "x/" > /dev/null; then
|
||||
@@ -13792,7 +13817,7 @@ else
|
||||
esac
|
||||
if test $ok = yes; then
|
||||
# An in-tree tool is available and we can use it
|
||||
RAW_CXX_FOR_TARGET='$$r/$(HOST_SUBDIR)/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'
|
||||
RAW_CXX_FOR_TARGET='$$r/$(HOST_SUBDIR)/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'
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: just compiled" >&5
|
||||
$as_echo "just compiled" >&6; }
|
||||
elif expr "x$RAW_CXX_FOR_TARGET" : "x/" > /dev/null; then
|
||||
|
Reference in New Issue
Block a user