Skip to content

Commit

Permalink
[hack] gyp: disable duplicate basename check
Browse files Browse the repository at this point in the history
  • Loading branch information
targos committed Jul 13, 2020
1 parent 5a3f5a5 commit 428ca3a
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion tools/gyp/pylib/gyp/__init__.py
Expand Up @@ -342,7 +342,7 @@ def gyp_main(args):
# deprecated.
parser.add_argument('--no-duplicate-basename-check',
dest='duplicate_basename_check', action='store_false',
default=True, regenerate=False,
default=False, regenerate=False,
help="don't check for duplicate basenames")
parser.add_argument('--no-parallel', action='store_true', default=False,
help='Disable multiprocessing')
Expand Down
18 changes: 9 additions & 9 deletions tools/gyp/pylib/gyp/generator/make.py
Expand Up @@ -673,15 +673,15 @@ def _ValidateSourcesForOSX(spec, all_sources):
basename = os.path.basename(name) # Don't include extension.
basenames.setdefault(basename, []).append(source)

error = ''
for basename, files in basenames.items():
if len(files) > 1:
error += ' %s: %s\n' % (basename, ' '.join(files))

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

# if error:
# print(('static library %s has several files with the same basename:\n' % spec['target_name'])
# + error + 'libtool on OS X will generate' + ' warnings for them.')
# raise GypError('Duplicate basenames in sources section, see list above')


# Map from qualified target to path to output.
Expand Down

0 comments on commit 428ca3a

Please sign in to comment.