Skip to content

Commit

Permalink
build: remove --xcode configure switch
Browse files Browse the repository at this point in the history
`./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 <benjamingr@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Beth Griggs <Bethany.Griggs@uk.ibm.com>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Gus Caplan <me@gus.host>
  • Loading branch information
bnoordhuis authored and MylesBorins committed May 4, 2018
1 parent 2b8b40f commit 348d391
Showing 1 changed file with 1 addition and 12 deletions.
13 changes: 1 addition & 12 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -501,11 +501,6 @@ parser.add_option('--without-node-options',
dest='without_node_options',
help='build without NODE_OPTIONS support')

parser.add_option('--xcode',
action='store_true',
dest='use_xcode',
help='generate build files for use with xcode')

parser.add_option('--ninja',
action='store_true',
dest='use_ninja',
Expand Down Expand Up @@ -1005,9 +1000,6 @@ def configure_node(o):

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

if options.use_xcode and options.use_ninja:
raise Exception('--xcode and --ninja cannot be used together.')

if options.coverage:
o['variables']['coverage'] = 'true'
else:
Expand Down Expand Up @@ -1530,7 +1522,6 @@ write('config.gypi', do_not_edit +

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

gyp_args = ['--no-parallel']

if options.use_xcode:
gyp_args += ['-f', 'xcode']
elif options.use_ninja:
if options.use_ninja:
gyp_args += ['-f', 'ninja']
elif flavor == 'win' and sys.platform != 'msys':
gyp_args += ['-f', 'msvs', '-G', 'msvs_version=auto']
Expand Down

0 comments on commit 348d391

Please sign in to comment.