Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Support building node with xcode #4022

Closed
wants to merge 3 commits into from

3 participants

@tjfontaine
Owner

This adds an option to configure to generate xcode project files, fixes v8 dependency chain, and lets xcode pick the proper compiler version instead of trying to force GCC 4.2 which is not a supported compiler in OS X 10.8.

Fixes #4020

@TooTallNate TooTallNate commented on the diff
configure
@@ -468,6 +473,7 @@ write('config.gypi', "# Do not edit. Generated by the configure script.\n" +
config = {
'BUILDTYPE': 'Debug' if options.debug else 'Release',
'USE_NINJA': str(int(options.use_ninja or 0)),
+ 'USE_XCODE': str(int(options.use_xcode or 0)),
@TooTallNate Owner

This doesn't look like it's necessary if the Makefile doesn't use the variable ever.

@tjfontaine Owner

I left it incase someone else wanted to carry the torch later

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@TooTallNate

does this belong upstream?

I'm not sure, as things seem to build fine for other renderers like ninja and make so it could be a gyp xcode bug

@bnoordhuis

Thanks TJ, landed in d264b23, ac04716 and 0f3ddad.

@bnoordhuis bnoordhuis closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
Showing with 10 additions and 2 deletions.
  1. +0 −1  common.gypi
  2. +8 −0 configure
  3. +2 −1  deps/v8/tools/gyp/v8.gyp
View
1  common.gypi
@@ -192,7 +192,6 @@
'GCC_ENABLE_CPP_RTTI': 'NO', # -fno-rtti
'GCC_ENABLE_PASCAL_STRINGS': 'NO', # No -mpascal-strings
'GCC_THREADSAFE_STATICS': 'NO', # -fno-threadsafe-statics
- 'GCC_VERSION': '4.2',
'PREBINDING': 'NO', # No -Wl,-prebind
'MACOSX_DEPLOYMENT_TARGET': '10.5', # -mmacosx-version-min=10.5
'USE_HEADERMAP': 'NO',
View
8 configure
@@ -176,6 +176,11 @@ parser.add_option("--ninja",
dest="use_ninja",
help="Generate files for the ninja build system")
+parser.add_option("--xcode",
+ action="store_true",
+ dest="use_xcode",
+ help="Generate build files for use with xcode")
+
(options, args) = parser.parse_args()
@@ -468,6 +473,7 @@ write('config.gypi', "# Do not edit. Generated by the configure script.\n" +
config = {
'BUILDTYPE': 'Debug' if options.debug else 'Release',
'USE_NINJA': str(int(options.use_ninja or 0)),
+ 'USE_XCODE': str(int(options.use_xcode or 0)),
@TooTallNate Owner

This doesn't look like it's necessary if the Makefile doesn't use the variable ever.

@tjfontaine Owner

I left it incase someone else wanted to carry the torch later

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
}
config = '\n'.join(map('='.join, config.iteritems())) + '\n'
@@ -476,6 +482,8 @@ write('config.mk',
if options.use_ninja:
gyp_args = ['-f', 'ninja']
+elif options.use_xcode:
+ gyp_args = ['-f', 'xcode']
elif os.name == 'nt':
gyp_args = ['-f', 'msvs', '-G', 'msvs_version=2010']
elif options.dest_os:
View
3  deps/v8/tools/gyp/v8.gyp
@@ -737,7 +737,8 @@
['v8_postmortem_support=="true"', {
'sources': [
'<(SHARED_INTERMEDIATE_DIR)/debug-support.cc',
- ]
+ ],
+ 'dependencies': ['postmortem-metadata']
}],
],
},
Something went wrong with that request. Please try again.