diff options
| author | Tom Tromey <tom@tromey.com> | 2019-10-22 16:22:58 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2020-01-14 16:25:02 -0700 |
| commit | b2ceabe8f0c2056342834b2b3f52f3b015538df3 (patch) | |
| tree | 8b4c16a77281523092995fcff85984a7bad6a862 /gdb/configure | |
| parent | 25c51f71d5bef8b4b71aa3e35cce974b54cda731 (diff) | |
| download | gdb-b2ceabe8f0c2056342834b2b3f52f3b015538df3.zip gdb-b2ceabe8f0c2056342834b2b3f52f3b015538df3.tar.gz gdb-b2ceabe8f0c2056342834b2b3f52f3b015538df3.tar.bz2 | |
Consolidate definition of USE_WIN32API
I noticed that USE_WIN32API is defined separately by gdbserver and
gdb. However, because it is used by code in gdbsupport, it should be
defined by common.m4. This approach ensures that the code will
continue to work when it is moved to the top level.
gdb/ChangeLog
2020-01-14 Tom Tromey <tom@tromey.com>
* gdbsupport/common.m4 (GDB_AC_COMMON): Define WIN32APILIBS and
USE_WIN32API when needed.
* configure.ac (USE_WIN32API): Don't define.
(WIN32LIBS): Use WIN32APILIBS.
* configure: Rebuild.
gdb/gdbserver/ChangeLog
2020-01-14 Tom Tromey <tom@tromey.com>
* configure.ac (LIBS): Use WIN32APILIBS.
(USE_WIN32API): Don't define.
* configure: Rebuild.
Change-Id: I40d524d5445ebfb452b36f4d0e102f0b1e1089df
Diffstat (limited to 'gdb/configure')
| -rwxr-xr-x | gdb/configure | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/gdb/configure b/gdb/configure index f9aed98..fe2d887 100755 --- a/gdb/configure +++ b/gdb/configure @@ -688,12 +688,12 @@ TCL_BIN_DIR TCL_PATCH_LEVEL TCL_VERSION WIN32LDAPP +WIN32LIBS GUI_CFLAGS_X LIBGUI LTLIBLZMA LIBLZMA HAVE_LIBLZMA -WIN32LIBS SER_HARDWIRE WERROR_CFLAGS WARN_CFLAGS @@ -13567,6 +13567,16 @@ _ACEOF fi + WIN32APILIBS= + case ${host} in + *mingw32*) + +$as_echo "#define USE_WIN32API 1" >>confdefs.h + + WIN32APILIBS="-lws2_32" + ;; + esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5 $as_echo_n "checking for nl_langinfo and CODESET... " >&6; } @@ -16356,15 +16366,8 @@ if test x"$gdb_cv_os_cygwin" = xyes; then fi # The ser-tcp.c module requires sockets. -case ${host} in - *mingw32*) - -$as_echo "#define USE_WIN32API 1" >>confdefs.h - - WIN32LIBS="$WIN32LIBS -lws2_32" - ;; -esac - +# Note that WIN32APILIBS is set by GDB_AC_COMMON. +WIN32LIBS="$WIN32LIBS $WIN32APILIBS" # Add ELF support to GDB, but only if BFD includes ELF support. |