Merge branch 'portable' into travisCIv2
This commit is contained in:
commit
1d005fcb8b
1 changed files with 2 additions and 2 deletions
4
Makefile
4
Makefile
|
@ -47,7 +47,7 @@ ifeq ($(WARNINGS), 1)
|
|||
CXXFLAGS += -Wall -Wextra -pedantic
|
||||
endif
|
||||
|
||||
ifeq ($(ALL_WARNINGS), 1)
|
||||
ifeq ($(WARNINGS_ALL), 1)
|
||||
ifneq ($(findstring clang,$(CXX)),)
|
||||
# Use clang-specific flag -Weverything
|
||||
CXXFLAGS += -Weverything
|
||||
|
@ -57,7 +57,7 @@ ifeq ($(ALL_WARNINGS), 1)
|
|||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(FATAL_WARNINGS), 1)
|
||||
ifeq ($(WARNINGS_FATAL), 1)
|
||||
CXXFLAGS += -Werror
|
||||
endif
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue