diff options
| author | Tormod Volden <debian.tormod@gmail.com> | 2022-02-10 18:43:23 +0100 |
|---|---|---|
| committer | Tormod Volden <debian.tormod@gmail.com> | 2022-03-16 17:53:00 +0100 |
| commit | f9162d36bf7253b3743d2973e385d32166ea0795 (patch) | |
| tree | 3af30036d3f57a30e4c57fda46cca9f6541bc9ac | |
| parent | 670f75f046f6f431255ab8836a4e63f877c64d2c (diff) | |
| download | libusb-f9162d36bf7253b3743d2973e385d32166ea0795.tar.gz | |
windows: Link gcc helpers statically on MinGW
Fixes #1049
Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | libusb/Makefile.am | 2 | ||||
| -rw-r--r-- | libusb/version_nano.h | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 002bcf6..7dd7dd4 100644 --- a/configure.ac +++ b/configure.ac @@ -124,6 +124,7 @@ case $host in platform=windows test "x$enable_shared" = xyes && create_import_lib=yes EXTRA_CFLAGS="-mwin32 -fno-omit-frame-pointer" + EXTRA_LDFLAGS="-static-libgcc" ;; *) AC_MSG_RESULT([Null]) @@ -394,6 +395,8 @@ AC_SUBST(AM_CXXFLAGS) AC_SUBST(LT_LDFLAGS) +AC_SUBST([EXTRA_LDFLAGS]) + dnl set name of html output directory for doxygen AC_SUBST(DOXYGEN_HTMLDIR, [api-1.0]) diff --git a/libusb/Makefile.am b/libusb/Makefile.am index baf7b38..3475c9a 100644 --- a/libusb/Makefile.am +++ b/libusb/Makefile.am @@ -80,7 +80,7 @@ all-local: .libs/libusb-1.0.dll.a endif endif -libusb_1_0_la_LDFLAGS = $(LT_LDFLAGS) +libusb_1_0_la_LDFLAGS = $(LT_LDFLAGS) $(EXTRA_LDFLAGS) libusb_1_0_la_SOURCES = libusbi.h version.h version_nano.h \ core.c descriptor.c hotplug.c io.c strerror.c sync.c \ $(PLATFORM_SRC) $(OS_SRC) diff --git a/libusb/version_nano.h b/libusb/version_nano.h index 888e511..6e2b30b 100644 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h @@ -1 +1 @@ -#define LIBUSB_NANO 11697 +#define LIBUSB_NANO 11698 |