diff options
| author | Alan Modra <amodra@bigpond.net.au> | 2001-01-22 13:50:17 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@bigpond.net.au> | 2001-01-22 13:50:17 +0000 |
| commit | 6e6a5a81bea11625100f462a199fe9e17943f465 (patch) | |
| tree | f945233d0719ad7a912b7f517bdf2898b7076a62 | |
| parent | 92729a386f7f5831fa7e10addbb62ee3d4181408 (diff) | |
| download | binutils-redhat-6e6a5a81bea11625100f462a199fe9e17943f465.tar.gz | |
Allow Maciej to select weird --libdir options and still select
tooldir correctly.
| -rw-r--r-- | ld/ChangeLog | 7 | ||||
| -rw-r--r-- | ld/Makefile.am | 2 | ||||
| -rw-r--r-- | ld/Makefile.in | 2 | ||||
| -rwxr-xr-x | ld/genscripts.sh | 31 |
4 files changed, 29 insertions, 13 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 4d4fa767c7..49ec5e4140 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,10 @@ +2001-01-22 Alan Modra <alan@linuxcare.com.au> + + * Makefile.am (GENSCRIPTS): Pass exec_prefix. + * Makefile.in: Regenerate. + * genscripts.sh: Use exec_prefix parameter to specify tool lib. + Check for null tool_dir. + 2001-01-16 Jim Wilson <wilson@redhat.com> * emulparams/elf64_ia64.sh (OTHER_READONLY_SECTIONS): Add IA_64.unwind diff --git a/ld/Makefile.am b/ld/Makefile.am index 75d74aa8a6..0b6d10ced1 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -302,7 +302,7 @@ stringify.sed: ${srcdir}/emultempl/$(STRINGIFY) # These all start with e so 'make clean' can find them. -GENSCRIPTS = $(SHELL) $(srcdir)/genscripts.sh ${srcdir} ${libdir} @host@ @target@ @target_alias@ "@EMULATION_LIBPATH@" "@NATIVE_LIB_DIRS@" +GENSCRIPTS = $(SHELL) $(srcdir)/genscripts.sh ${srcdir} ${libdir} ${exec_prefix} @host@ @target@ @target_alias@ "@EMULATION_LIBPATH@" "@NATIVE_LIB_DIRS@" GEN_DEPENDS = $(srcdir)/genscripts.sh stringify.sed @TDIRS@ diff --git a/ld/Makefile.in b/ld/Makefile.in index 79be0172f0..705963c53c 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -391,7 +391,7 @@ POTFILES = $(CFILES) $(HFILES) $(EMULATION_FILES) # These all start with e so 'make clean' can find them. -GENSCRIPTS = $(SHELL) $(srcdir)/genscripts.sh ${srcdir} ${libdir} @host@ @target@ @target_alias@ "@EMULATION_LIBPATH@" "@NATIVE_LIB_DIRS@" +GENSCRIPTS = $(SHELL) $(srcdir)/genscripts.sh ${srcdir} ${libdir} ${exec_prefix} @host@ @target@ @target_alias@ "@EMULATION_LIBPATH@" "@NATIVE_LIB_DIRS@" GEN_DEPENDS = $(srcdir)/genscripts.sh stringify.sed # We need this for automake to use YLWRAP. diff --git a/ld/genscripts.sh b/ld/genscripts.sh index 8294af7068..f6a29703d4 100755 --- a/ld/genscripts.sh +++ b/ld/genscripts.sh @@ -1,23 +1,32 @@ #!/bin/sh # genscripts.sh - generate the ld-emulation-target specific files # -# Usage: genscripts.sh srcdir libdir host target target_alias \ -# default_emulation native_lib_dirs this_emulation tool_dir +# Usage: genscripts.sh srcdir libdir exec_prefix \ +# host target target_alias default_emulation \ +# native_lib_dirs this_emulation tool_dir # # Sample usage: -# genscripts.sh /djm/ld-devo/devo/ld /usr/local/lib sparc-sun-sunos4.1.3 \ -# sparc-sun-sunos4.1.3 sparc-sun-sunos4.1.3 sun4 "" sun3 sparc-sun-sunos4.1.3 +# genscripts.sh /djm/ld-devo/devo/ld /usr/local/lib /usr/local \ +# sparc-sun-sunos4.1.3 sparc-sun-sunos4.1.3 sparc-sun-sunos4.1.3 sun4 \ +# "" sun3 sparc-sun-sunos4.1.3 # produces sun3.x sun3.xbn sun3.xn sun3.xr sun3.xu em_sun3.c srcdir=$1 libdir=$2 -host=$3 -target=$4 -target_alias=$5 -EMULATION_LIBPATH=$6 -NATIVE_LIB_DIRS=$7 -EMULATION_NAME=$8 -tool_lib=`echo ${libdir} | sed -e 's|/lib$||'`/${9-$target_alias}/lib +exec_prefix=$3 +host=$4 +target=$5 +target_alias=$6 +EMULATION_LIBPATH=$7 +NATIVE_LIB_DIRS=$8 +EMULATION_NAME=$9 +shift 9 +# Can't use ${1:-$target_alias} here due to an Ultrix shell bug. +if [ "x$1" = "x" ] ; then + tool_lib=${exec_prefix}/${target_alias}/lib +else + tool_lib=${exec_prefix}/$1/lib +fi # Include the emulation-specific parameters: . ${srcdir}/emulparams/${EMULATION_NAME}.sh |