diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-09-10 16:00:22 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-09-10 16:00:22 -0700 |
| commit | 6a6b36c50300bcc33d761598591c4d1bd4f1f6aa (patch) | |
| tree | fa6b9eeb5d9281258b42603465fab6fdbb101512 /templates | |
| parent | 2ed498151da3b68107312b6397dbff4b4f60e475 (diff) | |
Enable -Wconversion
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/Makefile.template | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/templates/Makefile.template b/templates/Makefile.template index d6bcb54bac..346b4f438c 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -247,10 +247,6 @@ CXX11_CHECK_CMD = $(CXX) -std=c++11 -o $(TMPOUT) -c test/build/c++11.cc HAS_CXX11 = $(shell $(CXX11_CHECK_CMD) 2> /dev/null && echo true || echo false) - # Detect if -Wshorten-64-to-32 is a thing - SHORTEN_64_TO_32_CHECK_CMD = $(CC) -Wshorten-64-to-32 test/build/empty.c - HAS_SHORTEN_64_TO_32 = $(shell $(SHORTEN_64_TO_32_CHECK_CMD) 2> /dev/null && echo true || echo false) - # The HOST compiler settings are used to compile the protoc plugins. # In most cases, you won't have to change anything, but if you are # cross-compiling, you can override these variables from GNU make's @@ -265,10 +261,7 @@ DEFINES += $(EXTRA_DEFINES) endif - CFLAGS += -std=c89 -pedantic -Wsign-conversion - ifeq ($(HAS_SHORTEN_64_TO_32),true) - CFLAGS += -Wshorten-64-to-32 - endif + CFLAGS += -std=c89 -pedantic -Wsign-conversion -Wconversion ifeq ($(HAS_CXX11),true) CXXFLAGS += -std=c++11 else |