git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

acinclude.m4 (GLIBCXX_EXPORT_INSTALL_INFO): When cross-compiling, put headers in $prefix/$target/include/c++. 

* acinclude.m4 (GLIBCXX_EXPORT_INSTALL_INFO): When
	cross-compiling, put headers in $prefix/$target/include/c++.
	* configure: Regenerated.

	* configure.ac: Set gcc_gxx_include_dir to $target/include/c++
	when cross-compiling.  Do not substitute libstdcxx_incdir.
	* configure: Regenerated.

From-SVN: r114845
This commit is contained in:
Mark Mitchell 2006-06-21 09:16:03 +00:00 committed by Mark Mitchell
parent 5d7b51995e
commit 0f57bf40b8
6 changed files with 564 additions and 313 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -1,3 +1,9 @@
2006-06-21 Mark Mitchell <mark@codesourcery.com>
* configure.ac: Set gcc_gxx_include_dir to $target/include/c++
when cross-compiling. Do not substitute libstdcxx_incdir.
* configure: Regenerated.
2006-06-21 Jakub Jelinek <jakub@redhat.com> 2006-06-21 Jakub Jelinek <jakub@redhat.com>
* varasm.c (mergeable_string_section): Check for embedded NULs and * varasm.c (mergeable_string_section): Check for embedded NULs and

839
gcc/configure vendored
View File

File diff suppressed because it is too large Load Diff

9
gcc/configure.ac
View File

@ -132,13 +132,17 @@ no) ;;
*) gcc_gxx_include_dir=$with_gxx_include_dir ;; *) gcc_gxx_include_dir=$with_gxx_include_dir ;;
esac]) esac])
# This logic must match libstdc++-v3/acinclude.m4:GLIBCXX_EXPORT_INSTALL_INFO.
if test x${gcc_gxx_include_dir} = x; then if test x${gcc_gxx_include_dir} = x; then
if test x${enable_version_specific_runtime_libs} = xyes; then if test x${enable_version_specific_runtime_libs} = xyes; then
gcc_gxx_include_dir='${libsubdir}/include/c++' gcc_gxx_include_dir='${libsubdir}/include/c++'
else else
libstdcxx_incdir='c++/$(version)' libstdcxx_incdir='include/c++/$(version)'
if test x$host != x$target; then
libstdcxx_incdir="$target_alias/$libstdcxx_incdir"
fi
changequote(<<, >>)dnl changequote(<<, >>)dnl
gcc_gxx_include_dir="\$(libsubdir)/\$(unlibsubdir)/..\`echo \$(exec_prefix) | sed -e 's|^\$(prefix)||' -e 's|/[^/]*|/..|g'\`/include/"${libstdcxx_incdir} gcc_gxx_include_dir="\$(libsubdir)/\$(unlibsubdir)/..\`echo \$(exec_prefix) | sed -e 's|^\$(prefix)||' -e 's|/[^/]*|/..|g'\`/$libstdcxx_incdir"
changequote([, ])dnl changequote([, ])dnl
fi fi
fi fi
@ -3576,7 +3580,6 @@ AC_SUBST(extra_programs)
AC_SUBST(float_h_file) AC_SUBST(float_h_file)
AC_SUBST(gcc_config_arguments) AC_SUBST(gcc_config_arguments)
AC_SUBST(gcc_gxx_include_dir) AC_SUBST(gcc_gxx_include_dir)
AC_SUBST(libstdcxx_incdir)
AC_SUBST(host_exeext) AC_SUBST(host_exeext)
AC_SUBST(host_xm_file_list) AC_SUBST(host_xm_file_list)
AC_SUBST(host_xm_include_list) AC_SUBST(host_xm_include_list)

6
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,9 @@
2006-06-21 Mark Mitchell <mark@codesourcery.com>
* acinclude.m4 (GLIBCXX_EXPORT_INSTALL_INFO): When
cross-compiling, put headers in $prefix/$target/include/c++.
* configure: Regenerated.
2006-06-20 Paolo Carlini <pcarlini@suse.de> 2006-06-20 Paolo Carlini <pcarlini@suse.de>
* include/tr1/random.tcc (struct _Private::_Mod_w<>, * include/tr1/random.tcc (struct _Private::_Mod_w<>,

9
libstdc++-v3/acinclude.m4
View File

@ -674,6 +674,7 @@ dnl
dnl Assumes cross_compiling bits already done, and with_cross_host in dnl Assumes cross_compiling bits already done, and with_cross_host in
dnl particular. dnl particular.
dnl dnl
dnl This logic must match gcc/configure.ac's setting of gcc_gxx_include_dir.
AC_DEFUN([GLIBCXX_EXPORT_INSTALL_INFO], [ AC_DEFUN([GLIBCXX_EXPORT_INSTALL_INFO], [
glibcxx_toolexecdir=no glibcxx_toolexecdir=no
glibcxx_toolexeclibdir=no glibcxx_toolexeclibdir=no
@ -705,7 +706,13 @@ AC_DEFUN([GLIBCXX_EXPORT_INSTALL_INFO], [
# Default case for install directory for include files. # Default case for install directory for include files.
if test $version_specific_libs = no && test $gxx_include_dir = no; then if test $version_specific_libs = no && test $gxx_include_dir = no; then
gxx_include_dir='${prefix}/include/c++/${gcc_version}' gxx_include_dir='include/c++/${gcc_version}'
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
fi fi
# Version-specific runtime libs processing. # Version-specific runtime libs processing.

8
libstdc++-v3/configure vendored
View File

@ -110162,7 +110162,13 @@ echo "${ECHO_T}$version_specific_libs" >&6
# Default case for install directory for include files. # Default case for install directory for include files.
if test $version_specific_libs = no && test $gxx_include_dir = no; then if test $version_specific_libs = no && test $gxx_include_dir = no; then
gxx_include_dir='${prefix}/include/c++/${gcc_version}' gxx_include_dir='include/c++/${gcc_version}'
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
fi fi
# Version-specific runtime libs processing. # Version-specific runtime libs processing.