From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 12 Sep 2005 13:17:19 +0000 (+0000)
Subject: (#EXTRA_CXXFLAGS): don't add
X-Git-Tag: release/2.7.10~4
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6b603eb66b1c76553159af914212322e19e45d5f;p=lilypond.git

(#EXTRA_CXXFLAGS): don't add
-Werror. Otherwise GCC barfs over various optimizations.
---

diff --git a/ChangeLog b/ChangeLog
index 50086508d9..6aec04e5b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-09-12  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* stepmake/stepmake/c++-vars.make (#EXTRA_CXXFLAGS): don't add
+	-Werror. Otherwise GCC barfs over various optimizations.
+
 	* scm/define-grob-properties.scm (all-internal-grob-properties):
 	add note-head property
 
diff --git a/VERSION b/VERSION
index b539d4a30c..ce8dc973f6 100644
--- a/VERSION
+++ b/VERSION
@@ -2,5 +2,5 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=7
 PATCH_LEVEL=10
-MY_PATCH_LEVEL=namespace
+MY_PATCH_LEVEL=
 
diff --git a/stepmake/stepmake/c++-vars.make b/stepmake/stepmake/c++-vars.make
index d5e67b889c..89bce34419 100644
--- a/stepmake/stepmake/c++-vars.make
+++ b/stepmake/stepmake/c++-vars.make
@@ -3,7 +3,7 @@ include $(stepdir)/compile-vars.make
 
 EXTRA_CXXFLAGS= -W -Wall -Wconversion
 #ifeq ($(MY_PATCH_LEVEL),)
-EXTRA_CXXFLAGS += -Werror
+#EXTRA_CXXFLAGS += -Werror
 #endif
 
 ALL_CXXFLAGS = $(CXXFLAGS) $(ICFLAGS) $(DEFINES) $(addprefix -I,$(INCLUDES)) $(USER_CFLAGS) $(EXTRA_CFLAGS) $(MODULE_CFLAGS) $($(PACKAGE)_CFLAGS) $($(PACKAGE)_CXXFLAGS) $(USER_CXXFLAGS) $(EXTRA_CXXFLAGS) $(MODULE_CXXFLAGS)