summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Hodge <tpg@mutabah.net>2016-08-20 15:46:26 +0800
committerJohn Hodge <tpg@mutabah.net>2016-08-20 15:46:26 +0800
commit548af8fae59f4daa0e9dfcc555e3b6e1158ee89b (patch)
tree76a0e9b81bb302e324ba253affe140418c934a6f
parentea8a0292728e2469135ceec585ceac7eecbd131d (diff)
downloadmrust-548af8fae59f4daa0e9dfcc555e3b6e1158ee89b.tar.gz
Travis - Disable sudo, turn of -Werror
-rw-r--r--.travis.yml1
-rw-r--r--Makefile7
2 files changed, 7 insertions, 1 deletions
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/