[vlc-commits] win32: Use -static rather than undocumented --static when linking

[Rafaël Carré]

vlc/vlc-2.2 | branch: master | Rafaël Carré <funman at videolan.org> | Tue May  3 13:44:40 2016 +0200| [df0cc4a64aa1f1068299dc6e4cbb95cb2ab17940] | committer: Rafaël Carré

win32: Use -static rather than undocumented --static when linking

Also remove -static-libgcc which is redundant with -static

(cherry picked from commit 56b8d4831c15164df304eae30a758f20ae81ddb6)
Signed-off-by: Rafaël Carré <funman at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=df0cc4a64aa1f1068299dc6e4cbb95cb2ab17940
---

 lib/Makefile.am   |    3 +--
 modules/common.am |    3 +--
 src/Makefile.am   |    3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/lib/Makefile.am b/lib/Makefile.am
index be1b6be..ddbe3c6 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -64,8 +64,7 @@ libvlc_la_LDFLAGS = \
 libvlc_la_DEPENDENCIES = libvlc.sym
 if HAVE_WIN32
 libvlc_la_DEPENDENCIES += ../src/libvlc_win32_rc.$(OBJEXT)
-libvlc_la_LDFLAGS += -Wl,../src/libvlc_win32_rc.$(OBJEXT) -avoid-version \
-					 -Wc,--static -Wc,-static-libgcc
+libvlc_la_LDFLAGS += -Wl,../src/libvlc_win32_rc.$(OBJEXT) -avoid-version -Wc,-static
 endif
 if HAVE_OS2
 libvlc_la_LDFLAGS += -avoid-version
diff --git a/modules/common.am b/modules/common.am
index c3b3f8e..8eac893 100644
--- a/modules/common.am
+++ b/modules/common.am
@@ -33,8 +33,7 @@ AM_LDFLAGS = \
 	-no-undefined \
 	$(top_builddir)/compat/libcompat.la $(LTLIBVLCCORE) 
 if HAVE_WIN32
-AM_LDFLAGS += $(top_builddir)/modules/module.rc.lo \
-              -Wc,--static -Wc,-static-libgcc
+AM_LDFLAGS += $(top_builddir)/modules/module.rc.lo -Wc,-static
 endif
 
 SUFFIXES = .asm
diff --git a/src/Makefile.am b/src/Makefile.am
index a7d06cc..d3cddbf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -190,8 +190,7 @@ libvlccore_la_LIBADD = $(LIBS_libvlccore) \
 libvlccore_la_DEPENDENCIES = libvlccore.sym
 if HAVE_WIN32
 libvlccore_la_DEPENDENCIES += libvlc_win32_rc.$(OBJEXT)
-libvlccore_la_LDFLAGS += -Wl,libvlc_win32_rc.$(OBJEXT) -avoid-version \
-						 -Wc,--static -Wc,-static-libgcc
+libvlccore_la_LDFLAGS += -Wl,libvlc_win32_rc.$(OBJEXT) -avoid-version -Wc,-static
 endif
 if HAVE_OS2
 libvlccore_la_LDFLAGS += -avoid-version