diff options
| author | Sam James <sam@gentoo.org> | 2022-04-14 02:13:03 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-04-15 10:20:39 +0100 |
| commit | 790ee9c43cf3143a9cdb45dc6d12648ce784f474 (patch) | |
| tree | 86de109ddbafb025a62ab618ee5f4afb917ed51e | |
| parent | d245091be10c09080f837becce4e2ff115cddad5 (diff) | |
| download | open-iscsi-790ee9c43cf3143a9cdb45dc6d12648ce784f474.tar.gz | |
iscsiuio: fix LDADD
- We don't want to use _LIBS here, we're building a library, not an executable.
- We want LDADD for the whole lot (not a mix of LDFLAGS/LIBS/LDADD),
but put the objects/libraries (.a files) first so that -l* works correctly.
Closes: https://github.com/open-iscsi/open-iscsi/issues/337
Fixes: 9fbd6009cd917f1152a367fa7e5ae3993133c1e4
Signed-off-by: Sam James <sam@gentoo.org>
| -rw-r--r-- | iscsiuio/src/unix/Makefile.am | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/iscsiuio/src/unix/Makefile.am b/iscsiuio/src/unix/Makefile.am index 8a94371..4c10711 100644 --- a/iscsiuio/src/unix/Makefile.am +++ b/iscsiuio/src/unix/Makefile.am @@ -27,16 +27,13 @@ iscsiuio_CFLAGS = $(AM_CFLAGS) \ $(LIBNL_CFLAGS) \ -DBYTE_ORDER=@ENDIAN@ -iscsiuio_LIBS = $(AM_LIBS) \ - -ldl \ - -rdynamic \ - $(LIBNL_LIBS) \ - -lpthread - -iscsiuio_LDADD = $(AM_LDADD) \ - ${top_srcdir}/src/uip/lib_iscsi_uip.a \ - ${top_srcdir}/src/apps/dhcpc/lib_apps_dhcpc.a\ +iscsiuio_LDADD = ${top_srcdir}/src/uip/lib_iscsi_uip.a \ + ${top_srcdir}/src/apps/dhcpc/lib_apps_dhcpc.a \ ${top_srcdir}/src/apps/brcm-iscsi/lib_apps_brcm_iscsi.a \ - ${top_srcdir}/src/unix/libs/lib_iscsiuio_hw_cnic.a + ${top_srcdir}/src/unix/libs/lib_iscsiuio_hw_cnic.a \ + $(AM_LDADD) \ + -ldl \ + $(LIBNL_LIBS) \ + -lpthread iscsiuio_YFLAGS = -d |