From d25eff3af7c323ba0ef95d74662b226b97b0af12 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Fri, 30 Aug 2013 11:51:51 -0500
Subject: [PATCH] configure: Darwin build settings

Modify comments and defaults for darwin builds.
Changing to use gcc wasn't working.
---
 configure/os/CONFIG.darwinCommon.darwinCommon |  6 ++++--
 configure/os/CONFIG_SITE.Common.darwin-x86    | 12 ++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/configure/os/CONFIG.darwinCommon.darwinCommon b/configure/os/CONFIG.darwinCommon.darwinCommon
index 517c41361..82b9b4344 100644
--- a/configure/os/CONFIG.darwinCommon.darwinCommon
+++ b/configure/os/CONFIG.darwinCommon.darwinCommon
@@ -59,8 +59,10 @@ COMMANDLINE_LIBRARY=READLINE
 
 GNU_DIR = /usr
 
-CC = $(GNU_BIN)/cc
-CCC = $(GNU_BIN)/c++
+# Apple soft-links these compilers to clang/clang++
+CC = cc
+CCC = c++
+GNU = NO
 
 #
 # Darwin shared libraries
diff --git a/configure/os/CONFIG_SITE.Common.darwin-x86 b/configure/os/CONFIG_SITE.Common.darwin-x86
index 5ddf09ace..9d9686071 100644
--- a/configure/os/CONFIG_SITE.Common.darwin-x86
+++ b/configure/os/CONFIG_SITE.Common.darwin-x86
@@ -14,19 +14,19 @@ ARCH_CLASS = x86_64
 #ARCH_CLASS = i386 x86_64
 
 #
-# Comment out the following 3 lines to build with Apple's GCC instead of CLANG.
+# Uncomment the following 3 lines to build with Apple's GCC instead of CLANG.
 #
-CC  = clang
-CCC = clang++
-GNU = NO
+#CC  = gcc
+#CCC = g++
+#GNU = YES
 
 
-# To use MacPorts GCC, comment out ALL the settings above this line,
-# then uncomment (and modify if necessary) the following instead:
+# To use MacPorts GCC uncomment (and modify if necessary) the following:
 
 #GNU_DIR = /opt/local
 #CC = $(GNU_BIN)/gcc -m64
 #CCC = $(GNU_BIN)/g++ -m64
+#GNU = YES
 
 # If you see this or similar errors while building in the src/cap5 directory
 #   gcc: error: unrecognized option '-no-cpp-precomp'