(#EXTRA_CXXFLAGS): don't add

-Werror. Otherwise GCC barfs over various optimizations.

diff --git a/ChangeLog b/ChangeLog
index 50086508d9f27be42d57ee1e2041051a65d9de45..6aec04e5b3b12493cd9ed29d5c69a919fae4b38c 100644 (file)
--- 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 b539d4a30cdae6fd3a4aeed0f7197191f002bee0..ce8dc973f6ece76b759b4211c0190a6212a0878f 100644 (file)
--- 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 d5e67b889c0a7477bab3d68a7ef801e341ba0ac0..89bce34419c01d3f722357efcca7b5b311733617 100644 (file)
--- 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)