summaryrefslogtreecommitdiff
path: root/Makefile.tpl
diff options
context:
space:
mode:
authoraaronwl <aaronwl@138bc75d-0d04-0410-961f-82ee72b054a4>2008-08-31 18:14:25 +0000
committeraaronwl <aaronwl@138bc75d-0d04-0410-961f-82ee72b054a4>2008-08-31 18:14:25 +0000
commit7d804f0444b23a9de39bb6c608f17c94e356cd28 (patch)
tree349007eb9608d2d70057524bcd0d030010875820 /Makefile.tpl
parent3cb0c12f0819cbbf5f8227dba197bb4f379b867f (diff)
downloadgcc-7d804f0444b23a9de39bb6c608f17c94e356cd28.tar.gz
2008-08-31 Aaron W. LaFramboise <aaronavay62@aaronwl.com>
<toplevel> * 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. <gcc> * mkmap-flat.awk: Add option pe_dll. * config/i386/t-cygming (SHLIB_LINK): Support building libgcc_s. * gcc/config/i386/t-cygwin (SHLIB_LC): Add. * gcc/config/i386/t-mingw32 (SHLIB_LC): Add. * config/i386/mingw32.h (SHARED_LIBGCC_UNDEFS_SPEC): New. (SUBTARGET_EXTRA_SPECS): Use SHARED_LIBGCC_UNDEFS_SPEC. (LINK_SPEC): Support libgcc_s. (LIBGCC_SPEC): Support libgcc_s. (LIBGCC_SONAME): New. <libstdc++-v3> * acinclude.m4 <enable_symvers>: Don't use symvers on Windows. * configure: Regenerated. * Makefile.in: Regenerated. * src/Makefile.in: Regenerated. * doc/makefile.in: Regenerated. * po/Makefile.in: Regenerated. * libmath/Makefile.in: Regenerated. * include/Makefile.in: Regenerated. * libsupc++/Makefile.in: Regenerated. * testsuite/makefile.in: Regenerated. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@139837 138bc75d-0d04-0410-961f-82ee72b054a4
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 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 +]