From 4c731042d4b9d3387c9269b10aa19e5ef88d98b3 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Thu, 19 Mar 2015 22:57:11 +0100 Subject: [PATCH] configure: use cc and c++ as defaults on os x MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit 8b2363d ("configure: use gcc and g++ as CC and CXX defaults") switches the CC and CXX defaults but it turns out that GYP uses cc and c++ as defaults on OS X. It also made the configure script complain about old compilers because the xcode gcc identifies as v4.2.1, whereas cc is less ambiguous about it being a clang hybrid. PR-URL: https://github.com/iojs/io.js/pull/1210 Reviewed-By: Jeremiah Senkpiel Reviewed-By: Johan Bergström --- configure | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/configure b/configure index e595da74ce..2c44090c3c 100755 --- a/configure +++ b/configure @@ -9,9 +9,10 @@ import sys import shutil import string -# gcc and g++ as defaults matches what GYP's Makefile generator does. -CC = os.environ.get('CC', 'gcc') -CXX = os.environ.get('CXX', 'g++') +# gcc and g++ as defaults matches what GYP's Makefile generator does, +# except on OS X. +CC = os.environ.get('CC', 'cc' if sys.platform == 'darwin' else 'gcc') +CXX = os.environ.get('CXX', 'c++' if sys.platform == 'darwin' else 'g++') root_dir = os.path.dirname(__file__) sys.path.insert(0, os.path.join(root_dir, 'tools', 'gyp', 'pylib'))