From ed75d4086c2cf22b0569eff4598fa1b9e45a3f66 Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Wed, 22 Mar 2017 15:46:04 +0000 Subject: [PATCH] Makefile: Use "clang++" for building C++ with clang. git-svn-id: https://svn.eduke32.com/eduke32@6088 1a8010ca-5511-0410-912e-c29ae57300e0 --- Common.mak | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Common.mak b/Common.mak index 322d33992..1763414d4 100644 --- a/Common.mak +++ b/Common.mak @@ -78,12 +78,13 @@ ifeq ($(findstring clang,$(CLANG_POTENTIAL_VERSION)),clang) endif ifneq (0,$(CLANG)) + CLANGXXNAME:=$(subst clang,clang++,$(CLANGNAME)) override CC=$(CLANGNAME) -x c - override CXX=$(CLANGNAME) -x c++ + override CXX=$(CLANGXXNAME) -x c++ override COBJC=$(CLANGNAME) -x objective-c - override COBJCXX=$(CLANGNAME) -x objective-c++ + override COBJCXX=$(CLANGXXNAME) -x objective-c++ override L_CC=$(CLANGNAME) - override L_CXX=$(CLANGNAME) + override L_CXX=$(CLANGXXNAME) endif # GCC version, for conditional selection of flags.