diff options
| author | Roland McGrath <[email protected]> | 2009-01-08 13:39:08 -0800 |
|---|---|---|
| committer | Roland McGrath <[email protected]> | 2009-01-08 13:39:26 -0800 |
| commit | e06762c31cdc3c5dcabe586e613984bbe9ae6284 (patch) | |
| tree | 894c1d47c5fd1ed88caeb1fc91415e782790226f | |
| parent | 91a9be6dd2e9867780d8a78753399b85ab06e601 (diff) | |
Don't depend on $(zip_LIBS), just link it in.
| -rw-r--r-- | libdw/ChangeLog | 4 | ||||
| -rw-r--r-- | libdw/Makefile.am | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libdw/ChangeLog b/libdw/ChangeLog index 67b36a51..fb1a8b0a 100644 --- a/libdw/ChangeLog +++ b/libdw/ChangeLog @@ -1,3 +1,7 @@ +2009-01-08 Roland McGrath <[email protected]> + + * Makefile.am (libdw.so): Don't depend on $(zip_LIBS), just link it in. + 2009-01-06 Roland McGrath <[email protected]> * Makefile.am (libdw.so): Link in $(zip_LIBS). diff --git a/libdw/Makefile.am b/libdw/Makefile.am index 8649395a..56c7a2ff 100644 --- a/libdw/Makefile.am +++ b/libdw/Makefile.am @@ -92,14 +92,14 @@ am_libdw_pic_a_OBJECTS = $(libdw_a_SOURCES:.c=.os) libdw_so_SOURCES = libdw.so: $(srcdir)/libdw.map libdw_pic.a \ ../libdwfl/libdwfl_pic.a ../libebl/libebl.a \ - ../libelf/libelf.so $(zip_LIBS) + ../libelf/libelf.so # The rpath is necessary for libebl because its $ORIGIN use will # not fly in a setuid executable that links in libdw. $(LINK) -shared -o $@ -Wl,--soname,$@.$(VERSION),-z,defs \ -Wl,--enable-new-dtags,-rpath,$(pkglibdir) \ -Wl,--version-script,$<,--no-undefined \ -Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\ - -ldl + -ldl $(zip_LIBS) if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi ln -fs $@ $@.$(VERSION) |