1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configure: use cc and c++ as defaults on os x

Browse Source 
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 <fishrock123@rocketmail.com>
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
This commit is contained in:
Ben Noordhuis 2015-03-19 22:57:11 +01:00
parent 2034137385
commit 4c731042d4
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure vendored
View File

@ -9,9 +9,10 @@ import sys
import shutil import shutil
import string import string
# gcc and g++ as defaults matches what GYP's Makefile generator does. # gcc and g++ as defaults matches what GYP's Makefile generator does,
CC = os.environ.get('CC', 'gcc') # except on OS X.
CXX = os.environ.get('CXX', 'g++') 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__) root_dir = os.path.dirname(__file__)
sys.path.insert(0, os.path.join(root_dir, 'tools', 'gyp', 'pylib')) sys.path.insert(0, os.path.join(root_dir, 'tools', 'gyp', 'pylib'))