# HG changeset patch
# User Chris Cannam
# Date 1517951563 0
# Node ID eee235c4f962fd2e2627c572a5f3da9a804dfaf3
# Parent  abaa17f7dec58f605c147f5edd6a1b1f9dcb2185# Parent  c5d591bcf899224926f5eddfc9acbae53644eaa1
Merge

diff -r abaa17f7dec5 -r eee235c4f962 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