summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2022-04-03 03:23:28 +0100
committerSam James <sam@gentoo.org>2022-04-03 03:23:36 +0100
commit9fbd6009cd917f1152a367fa7e5ae3993133c1e4 (patch)
treecb81a254f2708c61660f2b5364e19db959744b54
parent96667e0e06a65c94fd875db048776aad29eea829 (diff)
downloadopen-iscsi-9fbd6009cd917f1152a367fa7e5ae3993133c1e4.tar.gz
iscsiuio: respect LDFLAGS fully
Use LIBS rather than LDFLAGS which ensures automake gets the ordering right (some LDFLAGS values won't work correctly if not placed exactly before libraries). This should functionally work the same as before, just improve compatibility with bits like -Wl,--as-needed. Signed-off-by: Sam James <sam@gentoo.org>
-rw-r--r--iscsiuio/src/unix/Makefile.am5
1 files changed, 3 insertions, 2 deletions
diff --git a/iscsiuio/src/unix/Makefile.am b/iscsiuio/src/unix/Makefile.am
index a989ef0..8a94371 100644
--- a/iscsiuio/src/unix/Makefile.am
+++ b/iscsiuio/src/unix/Makefile.am
@@ -27,13 +27,14 @@ iscsiuio_CFLAGS = $(AM_CFLAGS) \
$(LIBNL_CFLAGS) \
-DBYTE_ORDER=@ENDIAN@
-iscsiuio_LDFLAGS= $(AM_LDADD) \
+iscsiuio_LIBS = $(AM_LIBS) \
-ldl \
-rdynamic \
$(LIBNL_LIBS) \
-lpthread
-iscsiuio_LDADD = ${top_srcdir}/src/uip/lib_iscsi_uip.a \
+iscsiuio_LDADD = $(AM_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