Skip to content
This repository has been archived by the owner on Apr 22, 2023. It is now read-only.

Support building node with xcode #4022

Closed
wants to merge 3 commits into from
Closed

Support building node with xcode #4022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
61578c6
add postmortem as a dependency if enabled
tjfontaine Sep 14, 2012
60f71b7
add configure option to generate xcode build files
tjfontaine Sep 14, 2012
8e6cc89
let xcode pick proper compiler
tjfontaine Sep 14, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion common.gypi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
8 changes: 8 additions & 0 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()


Expand Down Expand Up @@ -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)),
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

}
config = '\n'.join(map('='.join, config.iteritems())) + '\n'

Expand All @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion deps/v8/tools/gyp/v8.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,7 +737,8 @@
['v8_postmortem_support=="true"', {
'sources': [
'<(SHARED_INTERMEDIATE_DIR)/debug-support.cc',
]
],
'dependencies': ['postmortem-metadata']
}],
],
},
Expand Down