]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
configure/mingw: move libs in LDFLAGS to LDADD
authorJason Ish <jason.ish@oisf.net>
Mon, 30 Nov 2020 21:37:02 +0000 (15:37 -0600)
committerJason Ish <jason.ish@oisf.net>
Tue, 1 Dec 2020 16:52:07 +0000 (10:52 -0600)
Moving the libs specified in LDFLAGS to LDADD put them into the
correct placement on in the link command.

(cherry picked from commit 10f639e9d1edae14d87feb66059723d87b3efdb8)

configure.ac

index 21be5bcfda2d00923d2e10f53d0a00370f9b5934..1b586eca4d99279f84c9bd05b628b15af01558b7 100644 (file)
             ;;
         *-*-mingw32*|*-*-msys)
             CFLAGS="${CFLAGS} -DOS_WIN32"
-            LDFLAGS="${LDFLAGS} -lws2_32 -liphlpapi -lwbemuuid -lOle32 -lOleAut32 -lUuid"
             WINDOWS_PATH="yes"
             PCAP_LIB_NAME="wpcap"
             AC_DEFINE([HAVE_NON_POSIX_MKDIR], [1], [mkdir is not POSIX compliant: single arg])
             RUST_SURICATA_LIBNAME="suricata.lib"
-            RUST_LDADD="-luserenv -lshell32 -ladvapi32 -lgcc_eh"
+            RUST_LDADD=" -lws2_32 -liphlpapi -lwbemuuid -lOle32 -lOleAut32 -lUuid -luserenv -lshell32 -ladvapi32 -lgcc_eh"
             ;;
         *-*-cygwin)
             LUA_LIB_NAME="lua"