| Index: pylib/gyp/input.py
|
| diff --git a/pylib/gyp/input.py b/pylib/gyp/input.py
|
| index 4f07eaaab15df95b51711a6f0a771b4ced8969f5..7d3654aefcbd10947852131f03ef13c1137b4ac7 100644
|
| --- a/pylib/gyp/input.py
|
| +++ b/pylib/gyp/input.py
|
| @@ -2476,37 +2476,6 @@ def ValidateTargetType(target, target_dict):
|
| target_type))
|
|
|
|
|
| -def ValidateSourcesInTarget(target, target_dict, build_file,
|
| - duplicate_basename_check):
|
| - if not duplicate_basename_check:
|
| - return
|
| - # TODO: Check if MSVC allows this for loadable_module targets.
|
| - if target_dict.get('type', None) not in ('static_library', 'shared_library'):
|
| - return
|
| - sources = target_dict.get('sources', [])
|
| - basenames = {}
|
| - for source in sources:
|
| - name, ext = os.path.splitext(source)
|
| - is_compiled_file = ext in [
|
| - '.c', '.cc', '.cpp', '.cxx', '.m', '.mm', '.s', '.S']
|
| - if not is_compiled_file:
|
| - continue
|
| - basename = os.path.basename(name) # Don't include extension.
|
| - basenames.setdefault(basename, []).append(source)
|
| -
|
| - error = ''
|
| - for basename, files in basenames.iteritems():
|
| - 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' %
|
| - target + error + 'Some build systems, e.g. MSVC08 and Make generator '
|
| - 'for Mac, cannot handle that. Use --no-duplicate-basename-check to'
|
| - 'disable this validation.')
|
| - raise GypError('Duplicate basenames in sources section, see list above')
|
| -
|
| -
|
| def ValidateRulesInTarget(target, target_dict, extra_sources_for_rules):
|
| """Ensures that the rules sections in target_dict are valid and consistent,
|
| and determines which sources they apply to.
|
| @@ -2727,7 +2696,7 @@ def SetGeneratorGlobals(generator_input_info):
|
|
|
|
|
| def Load(build_files, variables, includes, depth, generator_input_info, check,
|
| - circular_check, duplicate_basename_check, parallel, root_targets):
|
| + circular_check, parallel, root_targets):
|
| SetGeneratorGlobals(generator_input_info)
|
| # A generator can have other lists (in addition to sources) be processed
|
| # for rules.
|
| @@ -2852,11 +2821,6 @@ def Load(build_files, variables, includes, depth, generator_input_info, check,
|
| ProcessVariablesAndConditionsInDict(
|
| target_dict, PHASE_LATELATE, variables, build_file)
|
|
|
| - # TODO(thakis): Get vpx_scale/arm/scalesystemdependent.c to be renamed to
|
| - # scalesystemdependent_arm_additions.c or similar.
|
| - if 'arm' in variables.get('target_arch', ''):
|
| - duplicate_basename_check = False
|
| -
|
| # Make sure that the rules make sense, and build up rule_sources lists as
|
| # needed. Not all generators will need to use the rule_sources lists, but
|
| # some may, and it seems best to build the list in a common spot.
|
| @@ -2865,8 +2829,6 @@ def Load(build_files, variables, includes, depth, generator_input_info, check,
|
| target_dict = targets[target]
|
| build_file = gyp.common.BuildFile(target)
|
| ValidateTargetType(target, target_dict)
|
| - ValidateSourcesInTarget(target, target_dict, build_file,
|
| - duplicate_basename_check)
|
| ValidateRulesInTarget(target, target_dict, extra_sources_for_rules)
|
| ValidateRunAsInTarget(target, target_dict, build_file)
|
| ValidateActionsInTarget(target, target_dict, build_file)
|
|
|