Skip to content

Commit 428ca3a

Browse files
committed
[hack] gyp: disable duplicate basename check
Refs: nodejs/node-v8#161
1 parent 5a3f5a5 commit 428ca3a

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

tools/gyp/pylib/gyp/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ def gyp_main(args):
342342
# deprecated.
343343
parser.add_argument('--no-duplicate-basename-check',
344344
dest='duplicate_basename_check', action='store_false',
345-
default=True, regenerate=False,
345+
default=False, regenerate=False,
346346
help="don't check for duplicate basenames")
347347
parser.add_argument('--no-parallel', action='store_true', default=False,
348348
help='Disable multiprocessing')

tools/gyp/pylib/gyp/generator/make.py

+9-9
Original file line numberDiff line numberDiff line change
@@ -673,15 +673,15 @@ def _ValidateSourcesForOSX(spec, all_sources):
673673
basename = os.path.basename(name) # Don't include extension.
674674
basenames.setdefault(basename, []).append(source)
675675

676-
error = ''
677-
for basename, files in basenames.items():
678-
if len(files) > 1:
679-
error += ' %s: %s\n' % (basename, ' '.join(files))
680-
681-
if error:
682-
print(('static library %s has several files with the same basename:\n' % spec['target_name'])
683-
+ error + 'libtool on OS X will generate' + ' warnings for them.')
684-
raise GypError('Duplicate basenames in sources section, see list above')
676+
# error = ''
677+
# for basename, files in basenames.items():
678+
# if len(files) > 1:
679+
# error += ' %s: %s\n' % (basename, ' '.join(files))
680+
681+
# if error:
682+
# print(('static library %s has several files with the same basename:\n' % spec['target_name'])
683+
# + error + 'libtool on OS X will generate' + ' warnings for them.')
684+
# raise GypError('Duplicate basenames in sources section, see list above')
685685

686686

687687
# Map from qualified target to path to output.

0 commit comments

Comments
 (0)