From 0038d136139cdceb9a0be90234d4e7f5dcd5c642 Mon Sep 17 00:00:00 2001 From: hristov Date: Fri, 24 Feb 2006 13:45:19 +0000 Subject: [PATCH] No pedantic-error option in case of gcc 4.0.X --- build/Makefile.linux | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build/Makefile.linux b/build/Makefile.linux index a16f5d9df85..54be96b1119 100644 --- a/build/Makefile.linux +++ b/build/Makefile.linux @@ -31,8 +31,13 @@ ifeq ($(CCMAJORV),2) CXXFLAGS = $(OPT) -W -Wall -fPIC -pipe CXXFLAGSNO = $(NOOPT) -W -Wall -fPIC -pipe else +ifeq ($(CCMAJORV),3) CXXFLAGS = $(OPT) -W -Wall -Woverloaded-virtual -fPIC -pipe -fmessage-length=0 -Wno-long-long -pedantic-errors -ansi -Dlinux CXXFLAGSNO = $(NOOPT) -W -Wall -Werror -fPIC -pipe -fmessage-length=0 -Wno-long-long -pedantic-errors -ansi +else +CXXFLAGS = $(OPT) -W -Wall -Woverloaded-virtual -fPIC -pipe -fmessage-length=0 -Wno-long-long -ansi -Dlinux +CXXFLAGSNO = $(NOOPT) -W -Wall -Werror -fPIC -pipe -fmessage-length=0 -Wno-long-long -ansi +endif endif CFLAGS = $(OPT) -Wall -Werror -fPIC -pipe -Wno-long-long -pedantic-errors -ansi FFLAGS = $(CLIBFOPT) $(FOPT) -fno-second-underscore -- 2.39.3