@@ -501,11 +501,6 @@ parser.add_option('--without-node-options',
501
501
dest=' without_node_options' ,
502
502
help=' build without NODE_OPTIONS support' )
503
503
504
- parser.add_option(' --xcode' ,
505
- action=' store_true' ,
506
- dest=' use_xcode' ,
507
- help=' generate build files for use with xcode' )
508
-
509
504
parser.add_option(' --ninja' ,
510
505
action=' store_true' ,
511
506
dest=' use_ninja' ,
@@ -1005,9 +1000,6 @@ def configure_node(o):
1005
1000
1006
1001
o[' variables' ][' asan' ] = int(options.enable_asan or 0)
1007
1002
1008
- if options.use_xcode and options.use_ninja:
1009
- raise Exception(' --xcode and --ninja cannot be used together.' )
1010
-
1011
1003
if options.coverage:
1012
1004
o[' variables' ][' coverage' ] = ' true'
1013
1005
else:
@@ -1530,7 +1522,6 @@ write('config.gypi', do_not_edit +
1530
1522
1531
1523
config = {
1532
1524
' BUILDTYPE' : ' Debug' if options.debug else ' Release' ,
1533
- ' USE_XCODE' : str(int(options.use_xcode or 0)),
1534
1525
' PYTHON' : sys.executable,
1535
1526
' NODE_TARGET_TYPE' : variables[' node_target_type' ],
1536
1527
}
@@ -1549,9 +1540,7 @@ write('config.mk', do_not_edit + config)
1549
1540
1550
1541
gyp_args = [' --no-parallel' ]
1551
1542
1552
- if options.use_xcode:
1553
- gyp_args += [' -f' , ' xcode' ]
1554
- elif options.use_ninja:
1543
+ if options.use_ninja:
1555
1544
gyp_args += [' -f' , ' ninja' ]
1556
1545
elif flavor == ' win' and sys.platform ! = ' msys' :
1557
1546
gyp_args += [' -f' , ' msvs' , ' -G' , ' msvs_version=auto' ]
0 commit comments