Adapt cxx-runtime-hack for 32- and 64-bit Cygwin

git-svn-id: svn://tug.org/texlive/trunk@33005 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 52 insertions, 43 deletions

diff --git a/Build/source/libs/teckit/configure b/Build/source/libs/teckit/configure
index b958ff03459..9979b4d0311 100755
--- a/Build/source/libs/teckit/configure
+++ b/Build/source/libs/teckit/configure
@@ -6005,13 +6005,14 @@ cout <<"worksok\n";
   return 0;
 }
 _ACEOF
-  case $host in
-  *cygwin*)  flags_try0='-static -static-libgcc';
-             flags_try1='-lstdc++'; flags_try2=$flags_try1;;
-  *)  flags_try0='-nodefaultlibs -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -lm'
-      flags_try1='-lgcc_eh -lgcc -lc -lgcc_eh -lgcc'
-      flags_try2='-lgcc -lc -lgcc';;
-  esac
+  case $host in #(
+  *cygwin*) :
+    flags_try0='-Wl,-Bstatic -lstdc++ -Wl,-Bdynamic' ;; #(
+  *) :
+    flags_try0='-nodefaultlibs -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -lm'
+             flags_try1='-lgcc_eh -lgcc -lc -lgcc_eh -lgcc'
+             flags_try2='-lgcc -lc -lgcc' ;;
+esac
   kpse_save_LIBS=$LIBS
   cpp_link_hack=false
   for flags in "$flags_try1" "$flags_try2"; do
diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog
index 4fa0830eb63..78d9a0e4077 100644
--- a/Build/source/m4/ChangeLog
+++ b/Build/source/m4/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-20  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* kpse-cxx-hack.m4: Adapt for 32- and 64-bit Cygwin.
+	From Ken Brown <kbrow1i@gmail.com>.
+
 2014-02-14  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* kpse-luajit-flags.m4: Simplify.
diff --git a/Build/source/m4/kpse-cxx-hack.m4 b/Build/source/m4/kpse-cxx-hack.m4
index 17ec949b63b..0b6d9cd8835 100644
--- a/Build/source/m4/kpse-cxx-hack.m4
+++ b/Build/source/m4/kpse-cxx-hack.m4
@@ -1,6 +1,6 @@
 # Public macros for the TeX Live (TL) tree.
 # Copyright (C) 2002 Olaf Weber <olaf@infovore.xs4all.nl>
-# Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
 #
 # This file is free software; the copyright holders
 # give unlimited permission to copy and/or distribute it,
@@ -63,13 +63,12 @@ using namespace std;
 #include <iostream.h>
 #endif]],
                                      [[cout <<"worksok\n";]])])
-  case $host in
-  *cygwin*)  flags_try0='-static -static-libgcc';
-             flags_try1='-lstdc++'; flags_try2=$flags_try1;;
-  *)  flags_try0='-nodefaultlibs -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -lm'
-      flags_try1='-lgcc_eh -lgcc -lc -lgcc_eh -lgcc'
-      flags_try2='-lgcc -lc -lgcc';;
-  esac
+  AS_CASE([$host],
+          [*cygwin*],
+            [flags_try0='-Wl,-Bstatic -lstdc++ -Wl,-Bdynamic'],
+            [flags_try0='-nodefaultlibs -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -lm'
+             flags_try1='-lgcc_eh -lgcc -lc -lgcc_eh -lgcc'
+             flags_try2='-lgcc -lc -lgcc'])
   kpse_save_LIBS=$LIBS
   cpp_link_hack=false
   for flags in "$flags_try1" "$flags_try2"; do
diff --git a/Build/source/texk/bibtex-x/configure b/Build/source/texk/bibtex-x/configure
index 61e0d56a7e4..5643af94ede 100755
--- a/Build/source/texk/bibtex-x/configure
+++ b/Build/source/texk/bibtex-x/configure
@@ -16857,13 +16857,14 @@ cout <<"worksok\n";
   return 0;
 }
 _ACEOF
-  case $host in
-  *cygwin*)  flags_try0='-static -static-libgcc';
-             flags_try1='-lstdc++'; flags_try2=$flags_try1;;
-  *)  flags_try0='-nodefaultlibs -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -lm'
-      flags_try1='-lgcc_eh -lgcc -lc -lgcc_eh -lgcc'
-      flags_try2='-lgcc -lc -lgcc';;
-  esac
+  case $host in #(
+  *cygwin*) :
+    flags_try0='-Wl,-Bstatic -lstdc++ -Wl,-Bdynamic' ;; #(
+  *) :
+    flags_try0='-nodefaultlibs -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -lm'
+             flags_try1='-lgcc_eh -lgcc -lc -lgcc_eh -lgcc'
+             flags_try2='-lgcc -lc -lgcc' ;;
+esac
   kpse_save_LIBS=$LIBS
   cpp_link_hack=false
   for flags in "$flags_try1" "$flags_try2"; do
diff --git a/Build/source/texk/dvisvgm/configure b/Build/source/texk/dvisvgm/configure
index 9d82664b716..1b484d71c7f 100755
--- a/Build/source/texk/dvisvgm/configure
+++ b/Build/source/texk/dvisvgm/configure
@@ -17132,13 +17132,14 @@ cout <<"worksok\n";
   return 0;
 }
 _ACEOF
-  case $host in
-  *cygwin*)  flags_try0='-static -static-libgcc';
-             flags_try1='-lstdc++'; flags_try2=$flags_try1;;
-  *)  flags_try0='-nodefaultlibs -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -lm'
-      flags_try1='-lgcc_eh -lgcc -lc -lgcc_eh -lgcc'
-      flags_try2='-lgcc -lc -lgcc';;
-  esac
+  case $host in #(
+  *cygwin*) :
+    flags_try0='-Wl,-Bstatic -lstdc++ -Wl,-Bdynamic' ;; #(
+  *) :
+    flags_try0='-nodefaultlibs -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -lm'
+             flags_try1='-lgcc_eh -lgcc -lc -lgcc_eh -lgcc'
+             flags_try2='-lgcc -lc -lgcc' ;;
+esac
   kpse_save_LIBS=$LIBS
   cpp_link_hack=false
   for flags in "$flags_try1" "$flags_try2"; do
diff --git a/Build/source/texk/lcdf-typetools/configure b/Build/source/texk/lcdf-typetools/configure
index a265594cbd3..a575cc41f4b 100755
--- a/Build/source/texk/lcdf-typetools/configure
+++ b/Build/source/texk/lcdf-typetools/configure
@@ -17429,13 +17429,14 @@ cout <<"worksok\n";
   return 0;
 }
 _ACEOF
-  case $host in
-  *cygwin*)  flags_try0='-static -static-libgcc';
-             flags_try1='-lstdc++'; flags_try2=$flags_try1;;
-  *)  flags_try0='-nodefaultlibs -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -lm'
-      flags_try1='-lgcc_eh -lgcc -lc -lgcc_eh -lgcc'
-      flags_try2='-lgcc -lc -lgcc';;
-  esac
+  case $host in #(
+  *cygwin*) :
+    flags_try0='-Wl,-Bstatic -lstdc++ -Wl,-Bdynamic' ;; #(
+  *) :
+    flags_try0='-nodefaultlibs -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -lm'
+             flags_try1='-lgcc_eh -lgcc -lc -lgcc_eh -lgcc'
+             flags_try2='-lgcc -lc -lgcc' ;;
+esac
   kpse_save_LIBS=$LIBS
   cpp_link_hack=false
   for flags in "$flags_try1" "$flags_try2"; do
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index 3740595932a..b7e3abc1463 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -17858,13 +17858,14 @@ cout <<"worksok\n";
   return 0;
 }
 _ACEOF
-  case $host in
-  *cygwin*)  flags_try0='-static -static-libgcc';
-             flags_try1='-lstdc++'; flags_try2=$flags_try1;;
-  *)  flags_try0='-nodefaultlibs -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -lm'
-      flags_try1='-lgcc_eh -lgcc -lc -lgcc_eh -lgcc'
-      flags_try2='-lgcc -lc -lgcc';;
-  esac
+  case $host in #(
+  *cygwin*) :
+    flags_try0='-Wl,-Bstatic -lstdc++ -Wl,-Bdynamic' ;; #(
+  *) :
+    flags_try0='-nodefaultlibs -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic -lm'
+             flags_try1='-lgcc_eh -lgcc -lc -lgcc_eh -lgcc'
+             flags_try2='-lgcc -lc -lgcc' ;;
+esac
   kpse_save_LIBS=$LIBS
   cpp_link_hack=false
   for flags in "$flags_try1" "$flags_try2"; do