From c45754eef74b5e7537b718314a4c3d0795be0245 Mon Sep 17 00:00:00 2001 From: jcoupey Date: Fri, 17 Apr 2020 15:24:06 +0200 Subject: [PATCH] Filter out -std=c++14 flag when building against libosrm, fixes #311. --- src/makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/makefile b/src/makefile index 3a750d332..0b4b8d22d 100644 --- a/src/makefile +++ b/src/makefile @@ -28,7 +28,8 @@ SRC = $(wildcard *.cpp)\ # Checking for libosrm ifeq ($(shell pkg-config --exists libosrm && echo 1),1) LDLIBS += $(shell pkg-config --libs libosrm) -lboost_filesystem -lboost_iostreams -lboost_thread -lrt -ltbb -CXXFLAGS += $(shell pkg-config --cflags libosrm) -D USE_LIBOSRM=true +LIBOSRMFLAGS = $(shell pkg-config --cflags libosrm) +CXXFLAGS += $(filter-out -std=c++14, $(LIBOSRMFLAGS)) -D USE_LIBOSRM=true else SRC := $(filter-out ./routing/libosrm_wrapper.cpp, $(SRC)) endif