-
-# Enable -Werror for x86_64 builds
-CFLAGS+= $(WERROR)
-CWARNFLAGS= $(filter-out -Wbad-function-cast, $(CWARNFLAGS_STD))
-
-# Objects that don't compile cleanly:
-#OBJS_NO_WERROR= \
-
-OBJS_WERROR=$(filter-out $(OBJS_NO_WERROR),$(OBJS))
-
-$(OBJS_WERROR): WERROR=-Werror
+#
+# XXX: CFLAGS
+#
+CWARNFLAGS = $(CWARNFLAGS_STD) -Wno-unused-parameter -Wshorten-64-to-32 -Wimplicit-int-conversion
+CXXWARNFLAGS = $(CXXWARNFLAGS_STD) -Wno-unused-parameter -Wno-cast-qual -Wno-shadow -Wshorten-64-to-32 -Wimplicit-int-conversion