From e782c1cecadea5f4445b8c3aa5b9b4740427204d Mon Sep 17 00:00:00 2001 From: Neil Moore Date: Sat, 31 May 2014 15:38:35 -0400 Subject: Allow make FORCE_CXX=clang++ FORCE_CC=clang This avoids our custom compiler version selection for all but crosshosted builds. Use at your own peril, as using a short compiler name evades some of our Makefile's detection of changed architectures etc. --- crawl-ref/source/Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/crawl-ref/source/Makefile b/crawl-ref/source/Makefile index 36daa8ddad..a6dbf4ac13 100644 --- a/crawl-ref/source/Makefile +++ b/crawl-ref/source/Makefile @@ -484,8 +484,17 @@ ifeq ($(shell which $(LMACH)gcc$(GCC_VER_SUFFIX) > /dev/null 2> /dev/null && ech LMACH := endif +ifneq ($(FORCE_CC),) +GCC := $(FORCE_CC) +else GCC := $(LMACH)$(GCC_VER_PREFIX)gcc$(GCC_VER_SUFFIX) +endif + +ifneq ($(FORCE_CXX),) +GXX := $(FORCE_CXX) +else GXX := $(LMACH)$(GCC_VER_PREFIX)g++$(GCC_VER_SUFFIX) +endif else -- cgit v1.2.3-54-g00ecf