diff options
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/configure.in b/configure.in index bee4c2998a6..87dd2c6dc41 100644 --- a/configure.in +++ b/configure.in @@ -361,7 +361,7 @@ case "${target}" in avr-*-*) noconfigdirs="$noconfigdirs target-libiberty ${libstdcxx_version} ${libgcj}" ;; - c4x-*-*) + c4x-*-* | tic4x-*-*) noconfigdirs="$noconfigdirs ${libstdcxx_version} target-libgloss ${libgcj}" ;; c54x*-*-* | tic54x-*-*) @@ -1321,20 +1321,23 @@ esac # If --enable-shared was set, we must set LD_LIBRARY_PATH so that the # binutils tools will find libbfd.so. if test "${shared}" = "yes" ; then - sed -e 's/^SET_LIB_PATH[ ]*=.*$/SET_LIB_PATH = $(REALLY_SET_LIB_PATH)/' \ - Makefile > Makefile.tem - rm -f Makefile - mv -f Makefile.tem Makefile - - case "${host}" in - *-*-hpux*) - sed -e 's/^RPATH_ENVVAR[ ]*=.*$/RPATH_ENVVAR = SHLIB_PATH/' \ - Makefile > Makefile.tem - rm -f Makefile - mv -f Makefile.tem Makefile - ;; - esac + SET_LIB_PATH="\$(REALLY_SET_LIB_PATH)" +else + SET_LIB_PATH= fi +sed -e "s/@SET_LIB_PATH@/${SET_LIB_PATH}/" Makefile > Makefile.tem +rm -f Makefile +mv -f Makefile.tem Makefile + + +case "${host}" in + *-*-hpux*) RPATH_ENVVAR=SHLIB_PATH ;; + *) RPATH_ENVVAR=LD_LIBRARY_PATH ;; +esac +sed -e "s/@RPATH_ENVVAR@/${RPATH_ENVVAR}/" Makefile > Makefile.tem +rm -f Makefile +mv -f Makefile.tem Makefile + # Base args. Strip norecursion, cache-file, srcdir, host, build, target. # These are the ones we might not want to pass down to subconfigures. |