[lmi-commits] [lmi] master 0ce3f15 2/3: Alphabetize and genericize lists of gcc runtime libraries

[Greg Chicares]

branch: master
commit 0ce3f15d95158faca3ef82cc18a1b9bdc4071e77
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Alphabetize and genericize lists of gcc runtime libraries
---
 msw_cygwin.make  | 6 +++---
 msw_generic.make | 8 +++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/msw_cygwin.make b/msw_cygwin.make
index b9745f3..d95b01a 100644
--- a/msw_cygwin.make
+++ b/msw_cygwin.make
@@ -78,9 +78,9 @@ RC      := $(gcc_bin_dir)$(host_prefix)windres
 compiler_sysroot := /MinGW_/i686-w64-mingw32/lib
 
 compiler_runtime_files := \
-  $(compiler_sysroot)/libstdc++-6.dll \
-  $(compiler_sysroot)/libgcc_s_sjlj-1.dll \
-  $(compiler_sysroot)/libwinpthread-1.dll \
+  $(wildcard $(compiler_sysroot)/libgcc*.dll) \
+  $(wildcard $(compiler_sysroot)/libstdc++*.dll) \
+  $(wildcard $(compiler_sysroot)/libwinpthread-1.dll) \
 
 
################################################################################
 
diff --git a/msw_generic.make b/msw_generic.make
index 48ad032..510c78e 100644
--- a/msw_generic.make
+++ b/msw_generic.make
@@ -60,13 +60,15 @@ RC      := $(gcc_bin_dir)$(host_prefix)windres
 # future debian releases, much less on other OSs.
 compiler_sysroot := /usr/lib/gcc/i686-w64-mingw32/6.3-win32
 
-# 'libwinpthread*' is not needed for cross builds--see:
+# 'libwinpthread*' is no longer needed for debian cross builds--see:
 #   https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=748353
 # | Provide compilers using Windows and POSIX threads. The default setup
 # | uses Windows threads, thus avoiding the dependency on the pthreads DLL
+# but including in this list with $(wildcard) does no harm.
 compiler_runtime_files := \
-  $(compiler_sysroot)/libstdc++-6.dll \
-  $(compiler_sysroot)/libgcc_s_sjlj-1.dll \
+  $(wildcard $(compiler_sysroot)/libgcc*.dll) \
+  $(wildcard $(compiler_sysroot)/libstdc++*.dll) \
+  $(wildcard $(compiler_sysroot)/libwinpthread-1.dll) \
 
 
################################################################################