configure.ac (gcc_gxx_include_dir): Use $(libsubdir_to_prefix).
gcc/ * configure.ac (gcc_gxx_include_dir): Use $(libsubdir_to_prefix). (gcc_tooldir): Likewise. * configure: Regenerate. * Makefile.in (libsubdir_to_prefix): New variable, based on the old configure.ac gcc_tooldir setting. (prefix_to_exec_prefix): New variable. (DRIVER_DEFINES): Use $(libsubdir_to_prefix)$(prefix_to_exec_prefix) rather than $(unlibsubdir)/../ to derive TOOLDIR_BASE_PREFIX. From-SVN: r126225
This commit is contained in:
Richard Sandiford
Richard Sandiford
parent
4f9c450c2f
commit
15c723f39f
4 changed files with 46 additions and 75 deletions
|
|
@ -1,3 +1,14 @@
|
|||
2007-07-02 Richard Sandiford <richard@codesourcery.com>
|
||||
|
||||
* configure.ac (gcc_gxx_include_dir): Use $(libsubdir_to_prefix).
|
||||
(gcc_tooldir): Likewise.
|
||||
* configure: Regenerate.
|
||||
* Makefile.in (libsubdir_to_prefix): New variable, based on the
|
||||
old configure.ac gcc_tooldir setting.
|
||||
(prefix_to_exec_prefix): New variable.
|
||||
(DRIVER_DEFINES): Use $(libsubdir_to_prefix)$(prefix_to_exec_prefix)
|
||||
rather than $(unlibsubdir)/../ to derive TOOLDIR_BASE_PREFIX.
|
||||
|
||||
2007-07-02 Daniel Berlin <dberlin@dberlin.org>
|
||||
|
||||
Fix PR tree-optimization/32583
|
||||
|
|
|
|||
|
|
@ -458,6 +458,36 @@ libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(version)
|
|||
libexecsubdir = $(libexecdir)/gcc/$(target_noncanonical)/$(version)
|
||||
# Used to produce a relative $(gcc_tooldir) in gcc.o
|
||||
unlibsubdir = ../../..
|
||||
# $(prefix), expressed as a path relative to $(libsubdir).
|
||||
#
|
||||
# An explanation of the sed strings:
|
||||
# -e 's|^$(prefix)||' matches and eliminates 'prefix' from 'exec_prefix'
|
||||
# -e 's|/$$||' match a trailing forward slash and eliminates it
|
||||
# -e 's|^[^/]|/|' forces the string to start with a forward slash (*)
|
||||
# -e 's|/[^/]*|../|g' replaces each occurrence of /<directory> with ../
|
||||
#
|
||||
# (*) Note this pattern overwrites the first character of the string
|
||||
# with a forward slash if one is not already present. This is not a
|
||||
# problem because the exact names of the sub-directories concerned is
|
||||
# unimportant, just the number of them matters.
|
||||
#
|
||||
# The practical upshot of these patterns is like this:
|
||||
#
|
||||
# prefix exec_prefix result
|
||||
# ------ ----------- ------
|
||||
# /foo /foo/bar ../
|
||||
# /foo/ /foo/bar ../
|
||||
# /foo /foo/bar/ ../
|
||||
# /foo/ /foo/bar/ ../
|
||||
# /foo /foo/bar/ugg ../../
|
||||
libsubdir_to_prefix := \
|
||||
$(unlibsubdir)/$(shell echo "$(libdir)" | \
|
||||
sed -e 's|^$(prefix)||' -e 's|/$$||' -e 's|^[^/]|/|' \
|
||||
-e 's|/[^/]*|../|g')
|
||||
# $(exec_prefix), expressed as a path relative to $(prefix).
|
||||
prefix_to_exec_prefix := \
|
||||
$(shell echo "$(exec_prefix)" | \
|
||||
sed -e 's|^$(prefix)||' -e 's|^/||' -e '/./s|$$|/|')
|
||||
# Directory in which to find other cross-compilation tools and headers.
|
||||
dollar = @dollar@
|
||||
# Used in install-cross.
|
||||
|
|
@ -1791,7 +1821,7 @@ DRIVER_DEFINES = \
|
|||
-DDEFAULT_TARGET_VERSION=\"$(version)\" \
|
||||
-DDEFAULT_TARGET_MACHINE=\"$(target_noncanonical)\" \
|
||||
-DSTANDARD_BINDIR_PREFIX=\"$(bindir)/\" \
|
||||
-DTOOLDIR_BASE_PREFIX=\"$(unlibsubdir)/../\" \
|
||||
-DTOOLDIR_BASE_PREFIX=\"$(libsubdir_to_prefix)$(prefix_to_exec_prefix)\" \
|
||||
@TARGET_SYSTEM_ROOT_DEFINE@ \
|
||||
$(VALGRIND_DRIVER_DEFINES) \
|
||||
`test "X$${SHLIB_LINK}" = "X" || test "@enable_shared@" != "yes" || echo "-DENABLE_SHARED_LIBGCC"` \
|
||||
|
|
|
|||
37
gcc/configure
vendored
37
gcc/configure
vendored
|
|
@ -1688,7 +1688,7 @@ if test x${gcc_gxx_include_dir} = x; then
|
|||
if test x$host != x$target; then
|
||||
libstdcxx_incdir="$target_alias/$libstdcxx_incdir"
|
||||
fi
|
||||
gcc_gxx_include_dir="\$(libsubdir)/\$(unlibsubdir)/..\`echo \$(exec_prefix) | sed -e 's|^\$(prefix)||' -e 's|/[^/]*|/..|g'\`/$libstdcxx_incdir"
|
||||
gcc_gxx_include_dir="\$(libsubdir)/\$(libsubdir_to_prefix)$libstdcxx_incdir"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
@ -16855,40 +16855,7 @@ if test "x$subdirs" != x; then
|
|||
fi
|
||||
echo "source ${srcdir}/gdbinit.in" >> .gdbinit
|
||||
|
||||
# If $(exec_prefix) exists and is not the same as $(prefix), then compute an
|
||||
# absolute path for gcc_tooldir based on inserting the number of up-directory
|
||||
# movements required to get from $(exec_prefix) to $(prefix) into the basic
|
||||
# $(libsubdir)/@(unlibsubdir) based path.
|
||||
# Don't set gcc_tooldir to tooldir since that's only passed in by the toplevel
|
||||
# make and thus we'd get different behavior depending on where we built the
|
||||
# sources.
|
||||
if test x$exec_prefix = xNONE -o x$exec_prefix = x$prefix; then
|
||||
gcc_tooldir='$(libsubdir)/$(unlibsubdir)/../$(target_noncanonical)'
|
||||
else
|
||||
# An explanation of the sed strings:
|
||||
# -e 's|^\$(prefix)||' matches and eliminates 'prefix' from 'exec_prefix'
|
||||
# -e 's|/$||' match a trailing forward slash and eliminates it
|
||||
# -e 's|^[^/]|/|' forces the string to start with a forward slash (*)
|
||||
# -e 's|/[^/]*|../|g' replaces each occurrence of /<directory> with ../
|
||||
#
|
||||
# (*) Note this pattern overwrites the first character of the string
|
||||
# with a forward slash if one is not already present. This is not a
|
||||
# problem because the exact names of the sub-directories concerned is
|
||||
# unimportant, just the number of them matters.
|
||||
#
|
||||
# The practical upshot of these patterns is like this:
|
||||
#
|
||||
# prefix exec_prefix result
|
||||
# ------ ----------- ------
|
||||
# /foo /foo/bar ../
|
||||
# /foo/ /foo/bar ../
|
||||
# /foo /foo/bar/ ../
|
||||
# /foo/ /foo/bar/ ../
|
||||
# /foo /foo/bar/ugg ../../
|
||||
#
|
||||
dollar='$$'
|
||||
gcc_tooldir="\$(libsubdir)/\$(unlibsubdir)/\`echo \$(exec_prefix) | sed -e 's|^\$(prefix)||' -e 's|/\$(dollar)||' -e 's|^[^/]|/|' -e 's|/[^/]*|../|g'\`\$(target_noncanonical)"
|
||||
fi
|
||||
gcc_tooldir='$(libsubdir)/$(libsubdir_to_prefix)$(target_noncanonical)'
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -141,9 +141,7 @@ if test x${gcc_gxx_include_dir} = x; then
|
|||
if test x$host != x$target; then
|
||||
libstdcxx_incdir="$target_alias/$libstdcxx_incdir"
|
||||
fi
|
||||
changequote(<<, >>)dnl
|
||||
gcc_gxx_include_dir="\$(libsubdir)/\$(unlibsubdir)/..\`echo \$(exec_prefix) | sed -e 's|^\$(prefix)||' -e 's|/[^/]*|/..|g'\`/$libstdcxx_incdir"
|
||||
changequote([, ])dnl
|
||||
gcc_gxx_include_dir="\$(libsubdir)/\$(libsubdir_to_prefix)$libstdcxx_incdir"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
@ -3603,42 +3601,7 @@ if test "x$subdirs" != x; then
|
|||
fi
|
||||
echo "source ${srcdir}/gdbinit.in" >> .gdbinit
|
||||
|
||||
# If $(exec_prefix) exists and is not the same as $(prefix), then compute an
|
||||
# absolute path for gcc_tooldir based on inserting the number of up-directory
|
||||
# movements required to get from $(exec_prefix) to $(prefix) into the basic
|
||||
# $(libsubdir)/@(unlibsubdir) based path.
|
||||
# Don't set gcc_tooldir to tooldir since that's only passed in by the toplevel
|
||||
# make and thus we'd get different behavior depending on where we built the
|
||||
# sources.
|
||||
if test x$exec_prefix = xNONE -o x$exec_prefix = x$prefix; then
|
||||
gcc_tooldir='$(libsubdir)/$(unlibsubdir)/../$(target_noncanonical)'
|
||||
else
|
||||
changequote(<<, >>)dnl
|
||||
# An explanation of the sed strings:
|
||||
# -e 's|^\$(prefix)||' matches and eliminates 'prefix' from 'exec_prefix'
|
||||
# -e 's|/$||' match a trailing forward slash and eliminates it
|
||||
# -e 's|^[^/]|/|' forces the string to start with a forward slash (*)
|
||||
# -e 's|/[^/]*|../|g' replaces each occurrence of /<directory> with ../
|
||||
#
|
||||
# (*) Note this pattern overwrites the first character of the string
|
||||
# with a forward slash if one is not already present. This is not a
|
||||
# problem because the exact names of the sub-directories concerned is
|
||||
# unimportant, just the number of them matters.
|
||||
#
|
||||
# The practical upshot of these patterns is like this:
|
||||
#
|
||||
# prefix exec_prefix result
|
||||
# ------ ----------- ------
|
||||
# /foo /foo/bar ../
|
||||
# /foo/ /foo/bar ../
|
||||
# /foo /foo/bar/ ../
|
||||
# /foo/ /foo/bar/ ../
|
||||
# /foo /foo/bar/ugg ../../
|
||||
#
|
||||
dollar='$$'
|
||||
gcc_tooldir="\$(libsubdir)/\$(unlibsubdir)/\`echo \$(exec_prefix) | sed -e 's|^\$(prefix)||' -e 's|/\$(dollar)||' -e 's|^[^/]|/|' -e 's|/[^/]*|../|g'\`\$(target_noncanonical)"
|
||||
changequote([, ])dnl
|
||||
fi
|
||||
gcc_tooldir='$(libsubdir)/$(libsubdir_to_prefix)$(target_noncanonical)'
|
||||
AC_SUBST(gcc_tooldir)
|
||||
AC_SUBST(dollar)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue