PR target/30039

[pf3gnuchains/gcc-fork.git] / config / gxx-include-dir.m4

diff --git a/config/gxx-include-dir.m4 b/config/gxx-include-dir.m4
index 87a65ad..4f54d42 100644 (file)
--- a/config/gxx-include-dir.m4
+++ b/config/gxx-include-dir.m4
@@ -14,10 +14,16 @@ case "${with_gxx_include_dir}" in
     ;;
   no | "")
     case "${enable_version_specific_runtime_libs}" in
-      yes) gxx_include_dir='${libsubdir}/include/c++' ;;
+      yes) gxx_include_dir='$(libsubdir)/include/c++' ;;
       *)
-       libstdcxx_incdir=c++/${gcc_version}
-       gxx_include_dir='${prefix}/include/'${libstdcxx_incdir} ;;
+       libstdcxx_incdir='c++/$(gcc_version)'
+       gxx_include_dir='include/$(libstdcxx_incdir)'
+       if test -n "$with_cross_host" && 
+           test x"$with_cross_host" != x"no"; then     
+          gxx_include_dir='${prefix}/${target_alias}/'"$gxx_include_dir"
+        else
+          gxx_include_dir='${prefix}/'"$gxx_include_dir"
+        fi;;
     esac ;;
   *) gxx_include_dir=${with_gxx_include_dir} ;;
 esac