From a9051bb2c32f30dc6f715bed593765b257ba1a48 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Thu, 26 Apr 2018 09:03:26 +0200 Subject: [PATCH] build: remove --xcode configure switch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `./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: https://github.com/nodejs/node/pull/20328 Fixes: https://github.com/nodejs/node/issues/20324 Reviewed-By: Benjamin Gruenbaum Reviewed-By: Gibson Fahnestock Reviewed-By: Michaël Zasso Reviewed-By: Beth Griggs Reviewed-By: Daniel Bevenius Reviewed-By: Joyee Cheung Reviewed-By: Colin Ihrig Reviewed-By: James M Snell Reviewed-By: Gus Caplan --- configure | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/configure b/configure index c1170f9a132..17e13a48d47 100755 --- a/configure +++ b/configure @@ -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', @@ -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: @@ -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'], } @@ -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']