From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sun, 16 Nov 2008 19:07:10 +0000 (-0200)
Subject: Revert "When LINK_GXX_STATICALLY=yes, use CC (ie, [*-*-]gcc) for linking.  Fixes... 
X-Git-Tag: release/2.11.64-1~2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=3dd83a7bb519f2a5128bc037762f74c73461adc1;p=lilypond.git

Revert "When LINK_GXX_STATICALLY=yes, use CC (ie, [*-*-]gcc) for linking.  Fixes --enable-static-c++."

This reverts commit 0d9ce36611b20603a079d039e90c4c737c0f394d.

With this change the GUB2 link with -mwindows fails, with none of the
stdlib function being found.
---

diff --git a/lily/GNUmakefile b/lily/GNUmakefile
index 41692eb1b6..3b13b8a6d9 100644
--- a/lily/GNUmakefile
+++ b/lily/GNUmakefile
@@ -23,8 +23,7 @@ ifeq ($(HAVE_LIBKPATHSEA_SO),no)
 MODULE_LDFLAGS += $(KPATHSEA_LIBS)
 endif
 ifeq ($(LINK_GXX_STATICALLY),yes)
-LD = $(CC) # GCC-4.0.x will never link statically to allow exceptions
-MODULE_LDFLAGS += -L$(outdir) -static-libgcc -lstdc++
+MODULE_LDFLAGS += -L$(outdir) -static-libgcc
 endif
 
 CXXFLAGS += -Woverloaded-virtual