aboutsummaryrefslogtreecommitdiff
path: root/Makefile.tpl
diff options
context:
space:
mode:
authorAaron W. LaFramboise <aaronavay62@aaronwl.com>2008-09-04 02:18:16 +0000
committerAaron W. LaFramboise <aaronavay62@aaronwl.com>2008-09-04 02:18:16 +0000
commit3bbd2f8f984e86fb7b58fdefd36768da80119169 (patch)
tree514d6cd789eb3762640cba60a80edee20430dd72 /Makefile.tpl
parent2992cbe0202e3b2fb79ecc49880c27cff3bcba11 (diff)
downloadgdb-3bbd2f8f984e86fb7b58fdefd36768da80119169.zip
gdb-3bbd2f8f984e86fb7b58fdefd36768da80119169.tar.gz
gdb-3bbd2f8f984e86fb7b58fdefd36768da80119169.tar.bz2
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.tpl7
1 files changed, 6 insertions, 1 deletions
diff --git a/Makefile.tpl b/Makefile.tpl
index a9dfd3e..051703e 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 +]