From 8d7ae45c3f4f5954fda907e4d3a0b785c1cfe517 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Mon, 7 Dec 2015 11:38:16 +0100 Subject: [PATCH] fix windows build till clang detection is fixed (nw) --- makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/makefile b/makefile index c19741941f3..3d526748cb2 100644 --- a/makefile +++ b/makefile @@ -730,8 +730,8 @@ SRC = src 3RDPARTY = 3rdparty ifeq ($(OS),windows) -GCC_VERSION := $(shell gcc -dumpversion 2> NUL) -CLANG_VERSION := $(shell %CLANG%\bin\clang --version 2> NUL| head -n 1 | sed "s/[^0-9,.]//g") +GCC_VERSION := $(shell $(subst @,,$(CC)) -dumpversion 2> NUL) +CLANG_VERSION := PYTHON_AVAILABLE := $(shell $(PYTHON) --version > NUL 2>&1 && echo python) CHECK_CLANG := ifdef MSBUILD