From f3fd76d41826effa0f94202be1811a52a9547b56 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 30 Mar 2005 08:39:18 +0000 Subject: 2005-02-28 Paolo Bonzini * Makefile.def (bfd, opcodes, libstdc++-v3, libmudflap): Set lib_path. * Makefile.tpl (SET_LIB_PATH, REALLY_SET_LIB_PATH): Remove. (HOST_EXPORTS, STAGE_HOST_EXPORTS, TARGET_EXPORTS): Set $(RPATH_ENVVAR). (HOST_LIB_PATH): Generate from Makefile.def. (TARGET_LIB_PATH): Likewise. (Old bootstrap targets): Include TARGET_LIB_PATH into RPATH_ENVVAR. * Makefile.in: Regenerate. * configure.in (set_lib_path, SET_LIB_PATH, SET_GCC_LIB_PATH): Remove. (RPATH_ENVVAR): Include Darwin case. * configure: Regenerate. config: 2005-02-28 Paolo Bonzini * config/gcc-lib-path.m4: Remove. --- configure.in | 43 ------------------------------------------- 1 file changed, 43 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index 91c7191df..6f18852ca 100644 --- a/configure.in +++ b/configure.in @@ -1625,28 +1625,6 @@ case "${host}" in ;; esac -# If no --enable-shared nor --disable-shared is specified, we set up -# LD_LIBRARY_PATH when we build for gcc. -case $enable_shared in -"") - if test -d ${srcdir}/gcc; then - set_lib_path=yes - else - set_lib_path=no - fi - ;; -*) - set_lib_path=$enable_shared - ;; -esac - -# If --enable-shared was set, we must set LD_LIBRARY_PATH so that the -# binutils tools will find libbfd.so. -case "${set_lib_path}" in - no) SET_LIB_PATH= ;; - *) SET_LIB_PATH="\$(REALLY_SET_LIB_PATH)" ;; -esac - case "${host}" in *-*-hpux*) RPATH_ENVVAR=SHLIB_PATH ;; *-*-darwin* | *-*-rhapsody* ) RPATH_ENVVAR=DYLD_LIBRARY_PATH ;; @@ -2116,7 +2094,6 @@ AC_SUBST_FILE(alphaieee_frag) AC_SUBST_FILE(ospace_frag) # Miscellanea: directories, flags, etc. -AC_SUBST(SET_LIB_PATH) AC_SUBST(RPATH_ENVVAR) AC_SUBST(BUILD_PREFIX) AC_SUBST(BUILD_PREFIX_1) @@ -2295,24 +2272,4 @@ 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 "${set_lib_path}" 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.3