Author: cazfi
Date: Thu Jun 30 07:04:08 2016
New Revision: 33113
URL: http://svn.gna.org/viewcvs/freeciv?rev=33113&view=rev
Log:
Use arch specific gcc_s filename while building msys2 installer packages
See patch #7344
Modified:
branches/S2_6/win32/installer_msys2/Makefile
Modified: branches/S2_6/win32/installer_msys2/Makefile
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer_msys2/Makefile?rev=33113&r1=33112&r2=33113&view=diff
==============================================================================
--- branches/S2_6/win32/installer_msys2/Makefile (original)
+++ branches/S2_6/win32/installer_msys2/Makefile Thu Jun 30 07:04:08 2016
@@ -12,10 +12,12 @@
ifeq ($(WINARCH),win64)
ARCHDIR=/mingw64
-GCCDLL=libgcc_s_seh-1.dll
+LIBGCCDLL=libgcc_s_seh-1.dll
+GCCDLL=gcc_s-seh-1.dll
else
ARCHDIR=/mingw32
-GCCDLL=libgcc_s_dw2-1.dll
+LIBGCCDLL=libgcc_s_dw2-1.dll
+GCCDLL=gcc_s-1.dll
endif
ifeq ($(MIN_WIN_VER),)
@@ -168,7 +170,7 @@
libffi-6.dll \
libfontconfig-1.dll \
libfreetype-6.dll \
- $(GCCDLL) \
+ $(LIBGCCDLL) \
libgdk_pixbuf-2.0-0.dll \
libgio-2.0-0.dll \
libglib-2.0-0.dll \
@@ -193,7 +195,7 @@
idn-11.dll \
sqlite3-0.dll \
ssl-1.0.0.dll \
- gcc_s-1.dll \
+ $(GCCDLL) \
z.dll \
bz2-1.dll \
crypto-1.0.0.dll \
@@ -299,7 +301,7 @@
libffi-6.dll \
libfontconfig-1.dll \
libfreetype-6.dll \
- $(GCCDLL) \
+ $(LIBGCCDLL) \
libglib-2.0-0.dll \
libgdk_pixbuf-2.0-0.dll \
libgio-2.0-0.dll \
@@ -321,7 +323,7 @@
idn-11.dll \
sqlite3-0.dll \
ssl-1.0.0.dll \
- gcc_s-1.dll \
+ $(GCCDLL) \
z.dll \
bz2-1.dll \
crypto-1.0.0.dll \
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
