Fix link order on Windows

Message ID 20190602091352.3651-1-orgads@gmail.com
State New
Headers show
Series
  • Fix link order on Windows
Related show

Commit Message

Orgad Shaneh June 2, 2019, 9:13 a.m.
From: Orgad Shaneh <orgads@gmail.com>


libgnu uses ntop, which comes from ws2_32 library, so ws2_32 needs
to be linked after libgnu.
---
 gdb/Makefile.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--
2.22.0.rc0.windows.1

Comments

Eli Zaretskii June 3, 2019, 3:11 p.m. | #1
> From: orgads@gmail.com

> Cc: Orgad Shaneh <orgads@gmail.com>

> Date: Sun,  2 Jun 2019 09:13:52 +0000

> 

> From: Orgad Shaneh <orgads@gmail.com>

> 

> libgnu uses ntop, which comes from ws2_32 library, so ws2_32 needs

> to be linked after libgnu.

> ---

>  gdb/Makefile.in | 4 ++--

>  1 file changed, 2 insertions(+), 2 deletions(-)

> 

> diff --git a/gdb/Makefile.in b/gdb/Makefile.in

> index 5614cc3386..037f9ae356 100644

> --- a/gdb/Makefile.in

> +++ b/gdb/Makefile.in

> @@ -595,8 +595,8 @@ CLIBS = $(SIM) $(READLINE) $(OPCODES) $(BFD) $(ZLIB) $(INTL) $(LIBIBERTY) $(LIBD

>         $(XM_CLIBS) $(GDBTKLIBS) \

>         @LIBS@ @GUILE_LIBS@ @PYTHON_LIBS@ \

>         $(LIBEXPAT) $(LIBLZMA) $(LIBBABELTRACE) $(LIBIPT) \

> -       $(LIBIBERTY) $(WIN32LIBS) $(LIBGNU) $(LIBICONV) $(LIBMPFR) \

> -       $(SRCHIGH_LIBS)

> +       $(LIBIBERTY) $(LIBGNU) $(LIBICONV) $(LIBMPFR) \

> +       $(SRCHIGH_LIBS) $(WIN32LIBS)

>  CDEPS = $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE_DEPS) \

>         $(OPCODES) $(INTL_DEPS) $(LIBIBERTY) $(CONFIG_DEPS) $(LIBGNU)

> 


LGTM, thanks.

Patch

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 5614cc3386..037f9ae356 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -595,8 +595,8 @@  CLIBS = $(SIM) $(READLINE) $(OPCODES) $(BFD) $(ZLIB) $(INTL) $(LIBIBERTY) $(LIBD
        $(XM_CLIBS) $(GDBTKLIBS) \
        @LIBS@ @GUILE_LIBS@ @PYTHON_LIBS@ \
        $(LIBEXPAT) $(LIBLZMA) $(LIBBABELTRACE) $(LIBIPT) \
-       $(LIBIBERTY) $(WIN32LIBS) $(LIBGNU) $(LIBICONV) $(LIBMPFR) \
-       $(SRCHIGH_LIBS)
+       $(LIBIBERTY) $(LIBGNU) $(LIBICONV) $(LIBMPFR) \
+       $(SRCHIGH_LIBS) $(WIN32LIBS)
 CDEPS = $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE_DEPS) \
        $(OPCODES) $(INTL_DEPS) $(LIBIBERTY) $(CONFIG_DEPS) $(LIBGNU)