diff options
| author | Neil Moore <neil@s-z.org> | 2014-05-31 15:38:35 -0400 |
|---|---|---|
| committer | Neil Moore <neil@s-z.org> | 2014-05-31 15:49:33 -0400 |
| commit | e782c1cecadea5f4445b8c3aa5b9b4740427204d (patch) | |
| tree | e74a049c7dea36cc2857225c61af35ca85a05471 | |
| parent | 5812d031727370d5569f5ebd4af25e0ce5b409ed (diff) | |
| download | crawl-ref-e782c1cecadea5f4445b8c3aa5b9b4740427204d.tar.gz crawl-ref-e782c1cecadea5f4445b8c3aa5b9b4740427204d.zip | |
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.
| -rw-r--r-- | crawl-ref/source/Makefile | 9 |
1 files changed, 9 insertions, 0 deletions
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 |