From cc5c585acf25bf7c0de9a4c529b8a98c7a957c9c Mon Sep 17 00:00:00 2001
From: Arien Malec <arien.malec@gmail.com>
Date: Fri, 5 Apr 2013 20:14:32 -0700
Subject: [PATCH 2/2] Simplify OS X build and default to clang

---
 crawl-ref/INSTALL.txt     |   18 +++++++++++-------
 crawl-ref/source/Makefile |   24 +++++++++++++++++++-----
 2 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/crawl-ref/INSTALL.txt b/crawl-ref/INSTALL.txt
index 3a42498..93e0222 100644
--- a/crawl-ref/INSTALL.txt
+++ b/crawl-ref/INSTALL.txt
@@ -209,20 +209,24 @@ associated command line tools. For recent versions of OS X, Xcode can be
 installed through the AppStore as a free download; the associated command
 line tools can then be installed by opening Xcode, opening the Preferences
 dialog, and clicking Install on the Command Line Tools line in the Download
-tab.
+tab. The Xcode Command Line Tools download also includes git.
 
-Mac builds then use the Unix build process described above, but require you
-to add 'APPLE_GCC=y' to the 'make' command-line. In addition, to build the
-graphical version of Crawl, you must add 'NO_PKGCONFIG=y' and
-'CONTRIB_SDL=y'.
+Mac builds then use the download and Unix build process described above, but
+require you to add 'XCODE=y' to the 'make' command-line in order to configure
+OS X specific libraries.
 
 So, to build build Crawl on a Mac you could use the following example
 command lines.
 
 For the console version:
-  make APPLE_GCC=y
+  make XCODE=y
 For the graphical version:
-  make APPLE_GCC=y NO_PKGCONFIG=y CONTRIB_SDL=y TILES=y
+  make XCODE=y TILES=y
+
+The default build uses the clang front end to LLVM, which is the most up to
+date for the OS X platform. If for some reason you wish to use the older GCC
+front end compiler, you may force it by adding FORCE_APPLE_GCC=y to the make command
+line.
 
 
 Building on Windows (MinGW)
diff --git a/crawl-ref/source/Makefile b/crawl-ref/source/Makefile
index 898971c..e32867a 100644
--- a/crawl-ref/source/Makefile
+++ b/crawl-ref/source/Makefile
@@ -311,14 +311,21 @@ endif
 #
 # Check for an Apple-released compiler.
 #
-ifndef NO_APPLE_GCC
+ifndef NO_APPLE_CLANG
 ifeq ($(uname_S),Darwin)
-ifneq ($(shell gcc -v 2>&1 | grep Apple),)
-APPLE_GCC = YesPlease
+ifneq ($(shell clang -v 2>&1 | grep Apple),)
+APPLE_CLANG = YesPlease
 endif
 endif
 endif
 
+ifdef FORCE_APPLE_GCC
+XCODE = YesPlease
+endif
+ifdef APPLE_CLANG
+XCODE = YesPlease
+endif
+
 
 ifdef WIN32
 EXTRA_OBJECTS += icon.o
@@ -396,7 +403,7 @@ LIBS += -Lcontrib/install/$(ARCH)/lib
 
 INCLUDES_L += -Iutil -I.
 
-ifdef APPLE_GCC
+ifdef XCODE
 
 MARCH := $(uname_M)
 
@@ -500,11 +507,18 @@ ifeq ($(shell which $(LMACH)gcc$(GCC_VER_SUFFIX) > /dev/null 2> /dev/null && ech
 LMACH :=
 endif
 
+# Prefer clang over GCC
+ifdef APPLE_CLANG
+ifdef FORCE_APPLE_GCC
 GCC := $(LMACH)$(GCC_VER_PREFIX)gcc$(GCC_VER_SUFFIX)
 GXX := $(LMACH)$(GCC_VER_PREFIX)g++$(GCC_VER_SUFFIX)
-
 else
+GCC := clang
+GXX := clang++
+endif
+endif
 
+else
 # Cross-compiling is a weird case.
 GCC := $(CROSSHOST)-gcc
 GXX := $(CROSSHOST)-g++
-- 
1.7.6

From 1ded805ae2343e8c5d40e65d685fb68102293e8d Mon Sep 17 00:00:00 2001
From: Arien Malec <arien.malec@gmail.com>
Date: Mon, 20 May 2013 07:44:40 -0700
Subject: [PATCH] Autodetect current OS X compiler

---
 crawl-ref/INSTALL.txt     |   12 +++++++-----
 crawl-ref/source/Makefile |   39 +++++++++++++++++++++++++++++++++++----
 2 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/crawl-ref/INSTALL.txt b/crawl-ref/INSTALL.txt
index f941d68..899d05c 100644
--- a/crawl-ref/INSTALL.txt
+++ b/crawl-ref/INSTALL.txt
@@ -211,17 +211,19 @@ dialog, and clicking Install on the Command Line Tools line in the Download
 tab.
 
 Mac builds then use the Unix build process described above, but require you
-to add 'APPLE_GCC=y' to the 'make' command-line. In addition, to build the
-graphical version of Crawl, you must add 'NO_PKGCONFIG=y' and
-'CONTRIB_SDL=y'.
+to add 'APPLE=y' to the 'make' command-line.
 
 So, to build build Crawl on a Mac you could use the following example
 command lines.
 
 For the console version:
-  make APPLE_GCC=y
+  make APPLE=y
 For the graphical version:
-  make APPLE_GCC=y NO_PKGCONFIG=y CONTRIB_SDL=y TILES=y
+  make APPLE=y TILES=y
+
+For later version of OS X, the clang complier is the default. To force use of
+GCC, add FORCE_APPLE_GCC=y to the command line:
+  make APPLE=y FORCE_APPLE_GCC=y
 
 
 Building on Windows (MinGW)
diff --git a/crawl-ref/source/Makefile b/crawl-ref/source/Makefile
index 296fe0f..53116c0 100644
--- a/crawl-ref/source/Makefile
+++ b/crawl-ref/source/Makefile
@@ -311,10 +311,10 @@ endif
 #
 # Check for an Apple-released compiler.
 #
-ifndef NO_APPLE_GCC
+ifndef NO_APPLE
 ifeq ($(uname_S),Darwin)
-ifneq ($(shell gcc -v 2>&1 | grep Apple),)
-APPLE_GCC = YesPlease
+ifneq ($(shell cc -v 2>&1 | grep Apple),)
+APPLE = YesPlease
 endif
 endif
 endif
@@ -396,7 +396,31 @@ LIBS += -Lcontrib/install/$(ARCH)/lib
 
 INCLUDES_L += -Iutil -I.
 
-ifdef APPLE_GCC
+ifdef APPLE
+
+# Default paramters for tiles build
+ifdef TILES
+ifndef NO_PKGCONFIG
+NO_PKGCONFIG=YesPlease
+endif
+ifndef CONTRIB_SDL
+CONTRIB_SDL=YesPlease
+endif
+endif
+
+# Figure out whether cc is linked to clang or gcc
+
+ifndef FORCE_APPLE_GCC
+ifneq ($(shell cc -v 2>&1 | grep clang),)
+APPLE_CLANG = YesPlease
+endif
+ifneq ($(shell cc -v 2>&1 | grep gcc),)
+APPLE_GCC = YesPlease
+endif
+else
+APPLE_GCC = YesPlease
+endif
+
 
 MARCH := $(uname_M)
 
@@ -483,6 +507,7 @@ endif # MacOS
 
 ifndef CROSSHOST
 
+ifdef APPLE_GCC
 ifneq ($(GCC_VER),)
 # We do this in a separate variable because if we
 # specify GCC_VER on the make command-line, the
@@ -502,6 +527,12 @@ endif
 
 GCC := $(LMACH)$(GCC_VER_PREFIX)gcc$(GCC_VER_SUFFIX)
 GXX := $(LMACH)$(GCC_VER_PREFIX)g++$(GCC_VER_SUFFIX)
+else
+ifdef APPLE_CLANG
+GCC := clang
+GXX := clang++
+endif
+endif
 
 else
 
-- 
1.7.6