package/develop/gcc/gxx_include.diff

   1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
   2 # T2 SDE: package/*/gcc/gxx_include.patch
   3 # Copyright (C) 2007 - 2021 The T2 SDE Project
   4 #
   5 # This Copyright note is generated by scripts/Create-CopyPatch,
   6 # more information can be found in the files COPYING and README.
   7 #
   8 # This patch file is dual-licensed. It is available under the license the
   9 # patched project is licensed under, as long as it is an OpenSource license
  10 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  11 # of the GNU General Public License version 2 as used by the T2 SDE.
  12 # --- T2-COPYRIGHT-NOTE-END ---
  13
  14 Use cross system headers for c++ and honor user specified --includedir for
  15 libstdc++ STL.
  16
  17 --- gcc-4.3.1/gcc/configure.vanilla     2008-07-18 17:07:44.000000000 +0200
  18 +++ gcc-4.3.1/gcc/configure     2008-07-18 17:30:02.000000000 +0200
  19 @@ -1686,13 +1686,10 @@
  20  # This logic must match libstdc++-v3/acinclude.m4:GLIBCXX_EXPORT_INSTALL_INFO.
  21  if test x${gcc_gxx_include_dir} = x; then
  22    if test x${enable_version_specific_runtime_libs} = xyes; then
  23 -    gcc_gxx_include_dir='${libsubdir}/include/c++'
  24 +    gcc_gxx_include_dir='${CROSS_SYSTEM_HEADER_DIR}/c++'
  25    else
  26 -    libstdcxx_incdir='include/c++/$(version)'
  27 -    if test x$host != x$target; then
  28 -       libstdcxx_incdir="$target_alias/$libstdcxx_incdir"
  29 -    fi
  30 -    gcc_gxx_include_dir="\$(libsubdir)/\$(libsubdir_to_prefix)$libstdcxx_incdir"
  31 +    libstdcxx_incdir='c++/$(version)'
  32 +    gcc_gxx_include_dir="\$(CROSS_SYSTEM_HEADER_DIR)/"${libstdcxx_incdir}
  33    fi
  34  fi
  35