diff options
| author | Aaron W. LaFramboise <aaronavay62@aaronwl.com> | 2008-09-04 02:18:16 +0000 |
|---|---|---|
| committer | Aaron W. LaFramboise <aaronavay62@aaronwl.com> | 2008-09-04 02:18:16 +0000 |
| commit | c3a8a63aa678ed6a3e00c1ef57d658955d9dbb26 (patch) | |
| tree | 1727ffa2a605f71345ae59b24dae6ecb7a031ca6 /Makefile.tpl | |
| parent | cb1db5e0dc11e69af4b4430702a4135fa9062aad (diff) | |
| download | gdb-c3a8a63aa678ed6a3e00c1ef57d658955d9dbb26.tar.gz | |
2008-08-31 Aaron W. LaFramboise <aaronavay62@aaronwl.com>
* configure.ac (RPATH_ENVVAR): Use PATH on Windows.
(GCC_SHLIB_SUBDIR): New.
* Makefile.tpl (HOST_LIB_PATH_gcc): Use GCC_SHLIB_SUBDIR.
* configure: Regenerate.
* Makefile.in: Regenerate.
Diffstat (limited to 'Makefile.tpl')
| -rw-r--r-- | Makefile.tpl | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Makefile.tpl b/Makefile.tpl index a9dfd3e2af4..051703eaa88 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -108,6 +108,11 @@ GDB_NLM_DEPS = # the libraries. RPATH_ENVVAR = @RPATH_ENVVAR@ +# On targets where RPATH_ENVVAR is PATH, a subdirectory of the GCC build path +# is used instead of the directory itself to avoid including built +# executables in PATH. +GCC_SHLIB_SUBDIR = @GCC_SHLIB_SUBDIR@ + # Build programs are put under this directory. BUILD_SUBDIR = @build_subdir@ # This is set by the configure script to the arguments to use when configuring @@ -440,7 +445,7 @@ HOST_LIB_PATH = [+ FOR host_modules +][+ # Define HOST_LIB_PATH_gcc here, for the sake of TARGET_LIB_PATH, ouch @if gcc -HOST_LIB_PATH_gcc = $$r/$(HOST_SUBDIR)/gcc:$$r/$(HOST_SUBDIR)/prev-gcc: +HOST_LIB_PATH_gcc = $$r/$(HOST_SUBDIR)/gcc$(GCC_SHLIB_SUBDIR):$$r/$(HOST_SUBDIR)/prev-gcc$(GCC_SHLIB_SUBDIR): @endif gcc [+ FOR host_modules +][+ IF lib_path +] |