diff options
| author | Eric Botcazou <ebotcazou@adacore.com> | 2018-05-10 09:39:00 +0000 |
|---|---|---|
| committer | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2018-05-10 09:39:00 +0000 |
| commit | b4d3485e4fc1d029e620a59deb54b3f4f3f6b209 (patch) | |
| tree | 2ad3c79c94d506ea7709a4820917ae639f7b5de5 /gcc | |
| parent | 573d8a243dd0493796ab9de876690b888c41b520 (diff) | |
| download | gcc-b4d3485e4fc1d029e620a59deb54b3f4f3f6b209.zip gcc-b4d3485e4fc1d029e620a59deb54b3f4f3f6b209.tar.gz gcc-b4d3485e4fc1d029e620a59deb54b3f4f3f6b209.tar.bz2 | |
configure.ac (gcc_gxx_include_dir_add_sysroot): Set it to 1 only when --with-gxx-include-dir is also specified.
* configure.ac (gcc_gxx_include_dir_add_sysroot): Set it to 1 only
when --with-gxx-include-dir is also specified.
* configure: Regenerate.
From-SVN: r260108
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rwxr-xr-x | gcc/configure | 14 | ||||
| -rw-r--r-- | gcc/configure.ac | 14 |
3 files changed, 20 insertions, 14 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 02d66d8..b48117f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2018-05-10 Eric Botcazou <ebotcazou@adacore.com> + + * configure.ac (gcc_gxx_include_dir_add_sysroot): Set it to 1 only + when --with-gxx-include-dir is also specified. + * configure: Regenerate. + 2018-05-09 Jim Wilson <jimw@sifive.com> PR target/84797 diff --git a/gcc/configure b/gcc/configure index 5c345ce..7d69faf 100755 --- a/gcc/configure +++ b/gcc/configure @@ -3580,6 +3580,11 @@ esac fi +# If both --with-sysroot and --with-gxx-include-dir are passed, we interpolate +# the former in the latter and, upon success, compute gcc_gxx_include_dir as +# relative to the sysroot. +gcc_gxx_include_dir_add_sysroot=0 + # This logic must match libstdc++-v3/acinclude.m4:GLIBCXX_EXPORT_INSTALL_INFO. if test x${gcc_gxx_include_dir} = x; then if test x${enable_version_specific_runtime_libs} = xyes; then @@ -3591,15 +3596,10 @@ if test x${gcc_gxx_include_dir} = x; then fi gcc_gxx_include_dir="\$(libsubdir)/\$(libsubdir_to_prefix)$libstdcxx_incdir" fi -fi - -gcc_gxx_include_dir_add_sysroot=0 -if test "${with_sysroot+set}" = set; then +elif test "${with_sysroot+set}" = set; then gcc_gxx_without_sysroot=`expr "${gcc_gxx_include_dir}" : "${with_sysroot}"'\(.*\)'` if test "${gcc_gxx_without_sysroot}"; then - if test x${with_sysroot} != x/; then - gcc_gxx_include_dir="${gcc_gxx_without_sysroot}" - fi + gcc_gxx_include_dir="${gcc_gxx_without_sysroot}" gcc_gxx_include_dir_add_sysroot=1 fi fi diff --git a/gcc/configure.ac b/gcc/configure.ac index 65dbf1f..36124b8 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -205,6 +205,11 @@ no) ;; *) gcc_gxx_include_dir=$with_gxx_include_dir ;; esac]) +# If both --with-sysroot and --with-gxx-include-dir are passed, we interpolate +# the former in the latter and, upon success, compute gcc_gxx_include_dir as +# relative to the sysroot. +gcc_gxx_include_dir_add_sysroot=0 + # This logic must match libstdc++-v3/acinclude.m4:GLIBCXX_EXPORT_INSTALL_INFO. if test x${gcc_gxx_include_dir} = x; then if test x${enable_version_specific_runtime_libs} = xyes; then @@ -216,15 +221,10 @@ if test x${gcc_gxx_include_dir} = x; then fi gcc_gxx_include_dir="\$(libsubdir)/\$(libsubdir_to_prefix)$libstdcxx_incdir" fi -fi - -gcc_gxx_include_dir_add_sysroot=0 -if test "${with_sysroot+set}" = set; then +elif test "${with_sysroot+set}" = set; then gcc_gxx_without_sysroot=`expr "${gcc_gxx_include_dir}" : "${with_sysroot}"'\(.*\)'` if test "${gcc_gxx_without_sysroot}"; then - if test x${with_sysroot} != x/; then - gcc_gxx_include_dir="${gcc_gxx_without_sysroot}" - fi + gcc_gxx_include_dir="${gcc_gxx_without_sysroot}" gcc_gxx_include_dir_add_sysroot=1 fi fi |