From 2afd0bf31b6827d8189c9f649e0eb9d8c985089a Mon Sep 17 00:00:00 2001 From: Eric Fischer Date: Mon, 25 Apr 2016 10:22:14 -0700 Subject: [PATCH] Try with clang++ instead --- .travis.yml | 2 ++ Makefile | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cd4c519..ca0c544 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,6 +28,8 @@ install: export CXXFLAGS="--coverage -g"; export CFLAGS="--coverage -g"; export LDFLAGS="--coverage"; + elif [[ $(uname -s) == 'Linux' ]]; then + export CXX=clang++; fi; - make diff --git a/Makefile b/Makefile index 2c84f92..57a2346 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ MANDIR ?= $(PREFIX)/share/man/man1/ CC := $(CC) CXX := $(CXX) CFLAGS := $(CFLAGS) -CXXFLAGS := $(CXXFLAGS) -std=c++0x +CXXFLAGS := $(CXXFLAGS) -std=c++11 LDFLAGS := $(LDFLAGS) all: tippecanoe tippecanoe-enumerate tippecanoe-decode tile-join