Skip to content

Commit 348d391

Browse files
bnoordhuisMylesBorins
authored andcommitted
build: remove --xcode configure switch
`./configure --xcode` ostensibly let you built with the Xcode IDE but it has never been tested regularly since its introduction in 2012 and probably has been broken for years. Remove it. PR-URL: #20328 Fixes: #20324 Reviewed-By: Benjamin Gruenbaum <[email protected]> Reviewed-By: Gibson Fahnestock <[email protected]> Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Beth Griggs <[email protected]> Reviewed-By: Daniel Bevenius <[email protected]> Reviewed-By: Joyee Cheung <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Gus Caplan <[email protected]>
1 parent 2b8b40f commit 348d391

File tree

1 file changed

+1
-12
lines changed

1 file changed

+1
-12
lines changed

configure

+1-12
Original file line numberDiff line numberDiff line change
@@ -501,11 +501,6 @@ parser.add_option('--without-node-options',
501501
dest='without_node_options',
502502
help='build without NODE_OPTIONS support')
503503

504-
parser.add_option('--xcode',
505-
action='store_true',
506-
dest='use_xcode',
507-
help='generate build files for use with xcode')
508-
509504
parser.add_option('--ninja',
510505
action='store_true',
511506
dest='use_ninja',
@@ -1005,9 +1000,6 @@ def configure_node(o):
10051000

10061001
o['variables']['asan'] = int(options.enable_asan or 0)
10071002

1008-
if options.use_xcode and options.use_ninja:
1009-
raise Exception('--xcode and --ninja cannot be used together.')
1010-
10111003
if options.coverage:
10121004
o['variables']['coverage'] = 'true'
10131005
else:
@@ -1530,7 +1522,6 @@ write('config.gypi', do_not_edit +
15301522

15311523
config = {
15321524
'BUILDTYPE': 'Debug' if options.debug else 'Release',
1533-
'USE_XCODE': str(int(options.use_xcode or 0)),
15341525
'PYTHON': sys.executable,
15351526
'NODE_TARGET_TYPE': variables['node_target_type'],
15361527
}
@@ -1549,9 +1540,7 @@ write('config.mk', do_not_edit + config)
15491540

15501541
gyp_args = ['--no-parallel']
15511542

1552-
if options.use_xcode:
1553-
gyp_args += ['-f', 'xcode']
1554-
elif options.use_ninja:
1543+
if options.use_ninja:
15551544
gyp_args += ['-f', 'ninja']
15561545
elif flavor == 'win' and sys.platform != 'msys':
15571546
gyp_args += ['-f', 'msvs', '-G', 'msvs_version=auto']

0 commit comments

Comments
 (0)