summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-10-13 12:54:26 +0200
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-10-23 13:56:33 +0200
commitff7b3f625de273b76f36a1e91d5823b9f5787007 (patch)
treedb3fcf1a1ba5d78ca1ba1ed3f5819cd3ff6f424a /lib
parent063f57dec14986d1895d83d9113fd1dec7f135f4 (diff)
For Windows builds, remove the so-version, link libgcc statically
The -static-libgcc flag has to be passed through the compiler with a "-Wc," prefix, because libtool tries to be clever about linker flags. If added directly to LDFLAGS, libtool removes it. Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'lib')
-rw-r--r--lib/sqfs/Makemodule.am3
-rw-r--r--lib/util/Makemodule.am3
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/sqfs/Makemodule.am b/lib/sqfs/Makemodule.am
index fa2ac19..f81ced7 100644
--- a/lib/sqfs/Makemodule.am
+++ b/lib/sqfs/Makemodule.am
@@ -33,7 +33,8 @@ libsquashfs_la_LIBADD += $(ZSTD_LIBS) $(PTHREAD_LIBS) libutil.la
if WINDOWS
libsquashfs_la_SOURCES += lib/sqfs/win32/io_file.c
-libsquashfs_la_LDFLAGS += -no-undefined
+libsquashfs_la_CFLAGS += -Wc,-static-libgcc
+libsquashfs_la_LDFLAGS += -no-undefined -avoid-version
else
libsquashfs_la_SOURCES += lib/sqfs/unix/io_file.c
endif
diff --git a/lib/util/Makemodule.am b/lib/util/Makemodule.am
index d6005fa..ffd594d 100644
--- a/lib/util/Makemodule.am
+++ b/lib/util/Makemodule.am
@@ -6,7 +6,8 @@ libutil_la_CPPFLAGS = $(AM_CPPFLAGS)
libutil_la_LDFLAGS = $(AM_LDFLAGS)
if WINDOWS
-libutil_la_LDFLAGS += -no-undefined
+libutil_la_CFLAGS += -Wc,-static-libgcc
+libutil_la_LDFLAGS += -no-undefined -avoid-version
endif
noinst_LTLIBRARIES += libutil.la