From 30ee1d84a554811d5fef2188b46f0a1fdc2e8e73 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Thu, 20 Feb 2014 08:31:22 +0000 Subject: Adapt cxx-runtime-hack for 32- and 64-bit Cygwin git-svn-id: svn://tug.org/texlive/trunk@33005 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/m4/ChangeLog | 5 +++++ Build/source/m4/kpse-cxx-hack.m4 | 15 +++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) (limited to 'Build/source/m4') 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 + + * kpse-cxx-hack.m4: Adapt for 32- and 64-bit Cygwin. + From Ken Brown . + 2014-02-14 Peter Breitenlohner * 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 -# Copyright (C) 2009, 2010 Peter Breitenlohner +# Copyright (C) 2009-2014 Peter Breitenlohner # # 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 #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 -- cgit v1.2.3