From d389b7e3624b2d0d09b8fb159c302d3e311107bc Mon Sep 17 00:00:00 2001 From: hjl Date: Fri, 24 Sep 2004 00:37:08 +0000 Subject: 2004-09-23 H.J. Lu PR bootstrap/17369 * Makefile.tpl (REALLY_SET_LIB_PATH): Add @SET_GCC_LIB_PATH@. (HOST_EXPORTS]): Add @SET_GCC_LIB_PATH@. Set and export SET_GCC_LIB_PATH_CMD. (BASE_TARGET_EXPORTS): Likewise. * Makefile.in: Regenerated. * configure.in (SET_GCC_LIB_PATH): Set and substitute. * configure: Regenerated. config/ 2004-09-23 H.J. Lu PR bootstrap/17369 * gcc-lib-path.m4: New file. gcc/ 2004-09-23 H.J. Lu PR bootstrap/17369 * Makefile.in (@set_gcc_lib_path@): Added. * configure.ac: Include ../config/gcc-lib-path.m4. Use TL_AC_GNU_MAKE_GCC_LIB_PATH. * configure: Regenerated. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@87999 138bc75d-0d04-0410-961f-82ee72b054a4 --- configure.in | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'configure.in') diff --git a/configure.in b/configure.in index b7e29761e7f..97240991399 100644 --- a/configure.in +++ b/configure.in @@ -2297,4 +2297,24 @@ case ${enable_werror} in esac AC_SUBST(stage2_werror_flag) +# If gcc is built natively with shared library enabled, set +# $RPATH_ENVVAR to make sure the newly built gcc shared librares are +# used. +SET_GCC_LIB_PATH= +if test -d ${srcdir}/gcc && test x${is_cross_compiler} = xno; then + case "${enable_shared}" in + no | "") ;; + *) + eval "d=\$$RPATH_ENVVAR" + if test x"$d" != x; then + d="$pwd/gcc:$d" + else + d="$pwd/gcc" + fi + SET_GCC_LIB_PATH="\$(RPATH_ENVVAR)=$d; export \$(RPATH_ENVVAR);" + ;; + esac +fi +AC_SUBST(SET_GCC_LIB_PATH) + AC_OUTPUT(Makefile) -- cgit v1.2.1