summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Cryptlib/Makefile2
-rw-r--r--Cryptlib/OpenSSL/Makefile9
-rw-r--r--Make.defaults8
3 files changed, 12 insertions, 7 deletions
diff --git a/Cryptlib/Makefile b/Cryptlib/Makefile
index 547fd106..89fd5cdc 100644
--- a/Cryptlib/Makefile
+++ b/Cryptlib/Makefile
@@ -11,6 +11,8 @@ INCLUDES = -I$(CRYPTDIR) -I$(CRYPTDIR)/Include \
-isystem $(TOPDIR)/include/system \
-isystem $(shell $(CC) -print-file-name=include)
+WARNFLAGS += -Wno-unused-parameter
+
CFLAGS = $(FEATUREFLAGS) \
$(OPTIMIZATIONS) \
$(WARNFLAGS) \
diff --git a/Cryptlib/OpenSSL/Makefile b/Cryptlib/OpenSSL/Makefile
index 1b8ca318..2b96c385 100644
--- a/Cryptlib/OpenSSL/Makefile
+++ b/Cryptlib/OpenSSL/Makefile
@@ -20,10 +20,11 @@ INCLUDES = -I$(OSSLDIR) -I$(CRYPTDIR) -I$(OSSLDIR)/Include/ \
FEATUREFLAGS += -nostdinc
-WERRFLAGS += -Wno-error=discarded-qualifiers \
- -Wno-error=maybe-uninitialized \
- -Wno-error=unused-function \
- -Wno-error=unused-but-set-variable
+WARNFLAGS += -Wno-empty-body \
+ -Wno-implicit-fallthrough \
+ -Wno-old-style-declaration \
+ -Wno-unused-but-set-variable \
+ -Wno-unused-parameter
CFLAGS = $(FEATUREFLAGS) \
$(OPTIMIZATIONS) \
diff --git a/Make.defaults b/Make.defaults
index f956c005..20aa8cd4 100644
--- a/Make.defaults
+++ b/Make.defaults
@@ -118,12 +118,12 @@ $(call conditional-add-flag,$(COLOR),diagnostics-color,FEATUREFLAGS,-fdiagnostic
override DEFAULT_WARNFLAGS = \
-Wall \
- -Wsign-compare
+ -Wextra \
+ -Wno-missing-field-initializers
$(call update-variable,WARNFLAGS)
override DEFAULT_WERRFLAGS = \
- -Werror \
- -Werror=sign-compare
+ -Werror
$(call update-variable,WERRFLAGS)
CFLAGS = $(FEATUREFLAGS) \
@@ -186,3 +186,5 @@ endif
ifneq ($(VERBOSE),)
export VERBOSE
endif
+
+# vim:filetype=make