Some old ad-hoc (adding -I/usr/include to compiler
flags) break compilation of libstdc++ for foreign
target architecture (due to compiler see includes
of native).
---
libstdc++-v3/acinclude.m4 | 5 -----
libstdc++-v3/configure | 22 ----------------------
libstdc++-v3/configure.ac | 14 --------------
3 files changed, 41 deletions(-)
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index e48cf96..60c93bf 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -734,11 +734,6 @@ AC_DEFUN([GLIBCXX_EXPORT_INCLUDES], [
-I$glibcxx_builddir/include \
-I$glibcxx_srcdir/libsupc++"
- # For Canadian crosses, pick this up too.
- if test $CANADIAN = yes; then
- GLIBCXX_INCLUDES="$GLIBCXX_INCLUDES -I\${includedir}"
- fi
-
# Stuff in the actual top level. Currently only used by libsupc++ to
# get unwind* headers from the libgcc dir.
#TOPLEVEL_INCLUDES='-I$(toplevel_srcdir)/libgcc -I$(toplevel_srcdir)/include'
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 9bf152a..7839518 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -21762,11 +21762,6 @@ done
# Only do link tests if native. Else, hardcode.
if $GLIBCXX_IS_NATIVE; then
- # We can do more elaborate tests that assume a working linker.
- CANADIAN=no
-
-
-
# Check whether --with-gnu-ld was given.
if test "${with_gnu_ld+set}" = set; then :
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
@@ -28807,17 +28802,6 @@ else
# When all of that is done, all of this hokey, excessive AC_DEFINE junk for
# crosses can be removed.
- # If Canadian cross, then don't pick up tools from the build directory.
- # Used only in GLIBCXX_EXPORT_INCLUDES.
- if test -n "$with_cross_host" &&
- test x"$build_alias" != x"$with_cross_host" &&
- test x"$build" != x"$target";
- then
- CANADIAN=yes
- else
- CANADIAN=no
- fi
-
# Construct crosses by hand, eliminating bits that need ld...
# GLIBCXX_CHECK_MATH_SUPPORT
@@ -81041,7 +81025,6 @@ CPU_OPT_BITS_RANDOM=config/${cpu_opt_bits_random}
# Determine cross-compile flags and AM_CONDITIONALs.
#AC_SUBST(GLIBCXX_IS_NATIVE)
-#AM_CONDITIONAL(CANADIAN, test $CANADIAN = yes)
if test $is_hosted = yes; then
GLIBCXX_HOSTED_TRUE=
GLIBCXX_HOSTED_FALSE='#'
@@ -81423,11 +81406,6 @@ $as_echo "$gxx_include_dir" >&6; }
-I$glibcxx_builddir/include \
-I$glibcxx_srcdir/libsupc++"
- # For Canadian crosses, pick this up too.
- if test $CANADIAN = yes; then
- GLIBCXX_INCLUDES="$GLIBCXX_INCLUDES -I\${includedir}"
- fi
-
# Stuff in the actual top level. Currently only used by libsupc++ to
# get unwind* headers from the libgcc dir.
#TOPLEVEL_INCLUDES='-I$(toplevel_srcdir)/libgcc -I$(toplevel_srcdir)/include'
diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac
index 9e19e99..3a8e26d 100644
--- a/libstdc++-v3/configure.ac
+++ b/libstdc++-v3/configure.ac
@@ -243,8 +243,6 @@ wchar.h wctype.h])
if $GLIBCXX_IS_NATIVE; then
# We can do more elaborate tests that assume a working linker.
- CANADIAN=no
-
GLIBCXX_CHECK_LINKER_FEATURES
GLIBCXX_CHECK_MATH_SUPPORT
GLIBCXX_CHECK_STDLIB_SUPPORT
@@ -276,17 +274,6 @@ else
# When all of that is done, all of this hokey, excessive AC_DEFINE junk for
# crosses can be removed.
- # If Canadian cross, then don't pick up tools from the build directory.
- # Used only in GLIBCXX_EXPORT_INCLUDES.
- if test -n "$with_cross_host" &&
- test x"$build_alias" != x"$with_cross_host" &&
- test x"$build" != x"$target";
- then
- CANADIAN=yes
- else
- CANADIAN=no
- fi
-
# Construct crosses by hand, eliminating bits that need ld...
# GLIBCXX_CHECK_MATH_SUPPORT
@@ -480,7 +467,6 @@ AC_SUBST(CPU_OPT_BITS_RANDOM)
# Determine cross-compile flags and AM_CONDITIONALs.
#AC_SUBST(GLIBCXX_IS_NATIVE)
-#AM_CONDITIONAL(CANADIAN, test $CANADIAN = yes)
GLIBCXX_EVALUATE_CONDITIONALS
AC_CACHE_SAVE
--
2.10.1
