From 548af8fae59f4daa0e9dfcc555e3b6e1158ee89b Mon Sep 17 00:00:00 2001 From: John Hodge Date: Sat, 20 Aug 2016 15:46:26 +0800 Subject: Travis - Disable sudo, turn of -Werror --- .travis.yml | 1 + Makefile | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ad77a1b1..ac2c5f39 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ language: cpp install: make +sudo: false before_script: - make UPDATE diff --git a/Makefile b/Makefile index 0067c515..013bcdf3 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,12 @@ V ?= @ LINKFLAGS := -g LIBS := -CXXFLAGS := -g -Wall -std=c++14 -Werror +CXXFLAGS := -g -Wall +# - Only turn on -Werror when running as `tpg` (i.e. me) +ifeq ($(shell whoami),tpg) + CXXFLAGS += -Werror +endif +CXXFLAGS += -std=c++14 #CXXFLAGS += -Wextra CXXFLAGS += -O2 CPPFLAGS := -I src/include/ -I src/ -- cgit v1.2.3