diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-01-25 15:01:10 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-01-25 15:01:10 -0800 |
| commit | 98d27d89a9c29af2411f8df61ee2ea9f1fd6aaa4 (patch) | |
| tree | 26ecfa38552d059b93aa8a88f61768cd267beead | |
| parent | 9e24165f4d2baebbcd79025c24623a5a8dba8a75 (diff) | |
| parent | 82f3f0d1782558acd11fa4794d7351164bb0790c (diff) | |
Merge branch 'mwah' of github.com:ctiller/grpc into mwah
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | templates/Makefile.template | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -261,7 +261,7 @@ endif 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) -CHECK_NO_SHIFT_NEGATIVE_VALUE_CMD = $(CC) -std=c99 -Wno-shift-negative-value -o $(TMPOUT) -c test/build/empty.c +CHECK_NO_SHIFT_NEGATIVE_VALUE_CMD = $(CC) -std=c99 -Werror -Wno-shift-negative-value -o $(TMPOUT) -c test/build/empty.c HAS_NO_SHIFT_NEGATIVE_VALUE = $(shell $(CHECK_NO_SHIFT_NEGATIVE_VALUE_CMD) 2> /dev/null && echo true || echo false) ifeq ($(HAS_NO_SHIFT_NEGATIVE_VALUE),true) W_NO_SHIFT_NEGATIVE_VALUE=-Wno-shift-negative-value diff --git a/templates/Makefile.template b/templates/Makefile.template index b52354c1a0..91f26a37d5 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -165,7 +165,7 @@ 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) - CHECK_NO_SHIFT_NEGATIVE_VALUE_CMD = $(CC) -std=c99 -Wno-shift-negative-value -o $(TMPOUT) -c test/build/empty.c + CHECK_NO_SHIFT_NEGATIVE_VALUE_CMD = $(CC) -std=c99 -Werror -Wno-shift-negative-value -o $(TMPOUT) -c test/build/empty.c HAS_NO_SHIFT_NEGATIVE_VALUE = $(shell $(CHECK_NO_SHIFT_NEGATIVE_VALUE_CMD) 2> /dev/null && echo true || echo false) ifeq ($(HAS_NO_SHIFT_NEGATIVE_VALUE),true) W_NO_SHIFT_NEGATIVE_VALUE=-Wno-shift-negative-value |