diff options
| author | Richard Sandiford <richard@codesourcery.com> | 2007-05-16 06:43:36 +0000 |
|---|---|---|
| committer | Richard Sandiford <rsandifo@gcc.gnu.org> | 2007-05-16 06:43:36 +0000 |
| commit | 4ef2b6ed338dc91e1143417181f978772d54bae9 (patch) | |
| tree | 5f4fe514ca446c48467629008ad6d9d9ab87fc10 /gcc/Makefile.in | |
| parent | 7433458d871f6bfe2169b9d7d04fec64bb142924 (diff) | |
| download | gcc-4ef2b6ed338dc91e1143417181f978772d54bae9.zip gcc-4ef2b6ed338dc91e1143417181f978772d54bae9.tar.gz gcc-4ef2b6ed338dc91e1143417181f978772d54bae9.tar.bz2 | |
revert: configure.ac (gcc_gxx_include_dir): Use $(libsubdir_to_prefix).
gcc/
Revert:
2007-05-12 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.
From-SVN: r124760
Diffstat (limited to 'gcc/Makefile.in')
| -rw-r--r-- | gcc/Makefile.in | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/gcc/Makefile.in b/gcc/Makefile.in index bdd5a86..8330a88 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -461,36 +461,6 @@ libexecdir = @libexecdir@ libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(version) # Directory in which the compiler finds executables libexecsubdir = $(libexecdir)/gcc/$(target_noncanonical)/$(version) -# $(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)/`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 = \ - `echo "$(exec_prefix)" | \ - sed -e 's|^$(prefix)||' -e 's|^/||' -e '/./s|$$|/|'` # Used to produce a relative $(gcc_tooldir) in gcc.o unlibsubdir = ../../.. # Directory in which to find other cross-compilation tools and headers. @@ -1808,7 +1778,7 @@ DRIVER_DEFINES = \ -DDEFAULT_TARGET_VERSION=\"$(version)\" \ -DDEFAULT_TARGET_MACHINE=\"$(target_noncanonical)\" \ -DSTANDARD_BINDIR_PREFIX=\"$(bindir)/\" \ - -DTOOLDIR_BASE_PREFIX=\"$(libsubdir_to_prefix)$(prefix_to_exec_prefix)\" \ + -DTOOLDIR_BASE_PREFIX=\"$(unlibsubdir)/../\" \ @TARGET_SYSTEM_ROOT_DEFINE@ \ $(VALGRIND_DRIVER_DEFINES) \ `test "X$${SHLIB_LINK}" = "X" || test "@enable_shared@" != "yes" || echo "-DENABLE_SHARED_LIBGCC"` \ |