Merged changes from the 3.14 branch to revno 12664

configure/os/CONFIG.linux-x86.windows-x64-mingw

@@ -22,7 +22,3 @@ GNU_LDLIBS_YES =
 
 # Link with winsock2
 OP_SYS_LDLIBS = -lws2_32
-
-# Use static compiler-support libraries
-OP_SYS_LDFLAGS += -static-libgcc -static-libstdc++
-# There is no compiler flag for static libwinpthread

configure/os/CONFIG_SITE.linux-x86.win32-x86-mingw

@@ -4,10 +4,10 @@
 #-------------------------------------------------------
 
 # Early versions of the MinGW cross-build tools can only build
-# static (non-DLL) libraries. For example RHEL's cross-gcc 4.4.6
-# needs these uncommented, cross-gcc 4.6.3 for Ubuntu does not:
-SHARED_LIBRARIES = NO
-STATIC_BUILD = YES
+# static (non-DLL) libraries. RHEL's cross-build of gcc 4.4.6
+# needs these uncommented, cross-gcc 4.6.3 from Ubuntu does not:
+#SHARED_LIBRARIES = NO
+#STATIC_BUILD = YES
 
 # The cross-build tools are in $(GNU_DIR)/bin
 # Default is /usr
@@ -20,3 +20,6 @@ STATIC_BUILD = YES
 CMPLR_PREFIX = i686-pc-mingw32-
 # Debian?
 #CMPLR_PREFIX = i586-mingw32msvc-
+
+# Use static compiler-support libraries
+OP_SYS_LDFLAGS += -static-libgcc -static-libstdc++

configure/os/CONFIG_SITE.linux-x86.windows-x64-mingw

@@ -18,3 +18,6 @@
 #CMPLR_PREFIX = i686-w64-mingw32-
 # RHEL:
 CMPLR_PREFIX = x86_64-w64-mingw32-
+
+# Use static compiler-support libraries
+OP_SYS_LDFLAGS += -static-libgcc -static-libstdc++