diff options
| author |   Nicolas Boulenguez <nicolas@debian.org> | 2021-05-20 09:58:51 +0930 |
|---|---|---|
| committer |   Alan Modra <amodra@gmail.com> | 2021-05-20 10:03:33 +0930 |
| commit | d556135f02ae050fb1fad841e427e420d98dcfd5 (patch) | |
| tree | 01008c52e3270cd0adc1c845a0f7ff633015da8f /gas/Makefile.am | |
| parent | Automatic date update in version.in (diff) | |
| download | binutils-gdb-d556135f02ae050fb1fad841e427e420d98dcfd5.tar.gz binutils-gdb-d556135f02ae050fb1fad841e427e420d98dcfd5.tar.bz2 binutils-gdb-d556135f02ae050fb1fad841e427e420d98dcfd5.zip | |
PR27888, fix link of gas with zlib by libtool 2.4.6
PR 27888
* Makefile.am (ZLIB): Define.
(as_new_LDADD): Add it.
* Makefile.in: Regenerate.
Diffstat (limited to 'gas/Makefile.am')
| -rw-r--r-- | gas/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gas/Makefile.am b/gas/Makefile.am index fdce608d64f..34190e78b8c 100644 --- a/gas/Makefile.am +++ b/gas/Makefile.am @@ -27,6 +27,7 @@ tooldir = $(exec_prefix)/$(target_alias) # This is where we get zlib from. zlibdir is -L../zlib and zlibinc is # -I../zlib, unless we were configured with --with-system-zlib, in which # case both are empty. +ZLIB = @zlibdir@ -lz ZLIBINC = @zlibinc@ YACC = `if [ -f ../bison/bison ] ; then echo ../bison/bison -y -L../bison/bison ; else echo @YACC@ ; fi` @@ -404,7 +405,7 @@ STAGESTUFF = *.@OBJEXT@ $(noinst_PROGRAMS) as_new_SOURCES = $(GAS_CFILES) as_new_LDADD = $(TARG_CPU_O) $(OBJ_FORMAT_O) $(ATOF_TARG_O) \ - $(extra_objects) $(GASLIBS) $(LIBINTL) $(LIBM) + $(extra_objects) $(GASLIBS) $(LIBINTL) $(LIBM) $(ZLIB) as_new_DEPENDENCIES = $(TARG_CPU_O) $(OBJ_FORMAT_O) $(ATOF_TARG_O) \ $(extra_objects) $(GASLIBS) $(LIBINTL_DEP) EXTRA_as_new_SOURCES = $(CFILES) $(HFILES) $(TARGET_CPU_CFILES) \ |