From 452b2c34a7064020a49d44068155062b8be3ca20 Mon Sep 17 00:00:00 2001 From: Timothy J Warren Date: Fri, 8 May 2015 22:20:59 -0400 Subject: [PATCH] Fix clang build on Travis --- Makefile | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 91e79c6..448e3c1 100644 --- a/Makefile +++ b/Makefile @@ -31,15 +31,20 @@ endif ifeq ($(OS),Darwin) CXX = $(shell wx-config --cxx) LDLIBS += /usr/local/lib/libssh2.a -endif -ifeq ($(OS),Linux) - CXX += -std=c++11 +else LDLIBS += -lssh2 endif + +ifeq ($(OS),Linux) +ifeq ($(CXX),clang++) + CXX += -std=c++11 -Wno-potentially-evaluated-expression +endif +endif + ifeq ($(OS),Windows_NT) CXXFLAGS += -static CXX += -I/include -DWIN32 - LDLIBS += -L/lib -lwsock32 -lssh2 + LDLIBS += -L/lib -lwsock32 endif CXX += -Iinclude -I. -I/usr/local/include