# HG changeset patch
# User Chris Cannam <c.cannam@qmul.ac.uk>
# Date 1517951563 0
# Node ID 236fcb53cfa9bde4f268228fa45efed2bbe29573
# Parent  554ded873378e7f99978930436e7d5a240c17378# Parent  455093c442f3b0c81c461f117c77c12cff1c3833
Merge

diff -r 554ded873378 -r 236fcb53cfa9 build/linux/Makefile.linux64
--- a/build/linux/Makefile.linux64	Tue Feb 06 21:12:03 2018 +0000
+++ b/build/linux/Makefile.linux64	Tue Feb 06 21:12:43 2018 +0000
@@ -2,7 +2,7 @@
 CFLAGS := -DNDEBUG -Wall -Wextra -Werror=implicit-function-declaration -O3 -fPIC -ffast-math -msse -msse2 -mfpmath=sse -ftree-vectorize -DUSE_PTHREADS
 #CFLAGS := -DDEBUG -g -Wall -Wextra -Werror=implicit-function-declaration -fPIC -ffast-math -DUSE_PTHREADS
 
-CXXFLAGS := $(CFLAGS) -Werror
+CXXFLAGS := $(CFLAGS)
 
 include build/general/Makefile.inc