Skip to content

Commit

Permalink
Use object_filename_from_source when creating objects.
Browse files Browse the repository at this point in the history
This will ensure a consistent path between generated object names and
names expected of extracted objects.
  • Loading branch information
QuLogic committed Aug 15, 2017
1 parent 879770c commit b68cb3c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 15 deletions.
2 changes: 1 addition & 1 deletion mesonbuild/backend/backends.py
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ def object_filename_from_source(self, target, source, is_unity):
if source.endswith(('.vala', '.gs')):
if is_unity:
return source[:-5] + '.c.' + self.environment.get_object_suffix()
source = os.path.join(self.get_target_private_dir(target), source[:-5] + '.c')
source = source[:-5] + '.c'
return source.replace('/', '_').replace('\\', '_') + '.' + self.environment.get_object_suffix()

def determine_ext_objs(self, target, extobj, proj_dir_to_build_root):
Expand Down
15 changes: 1 addition & 14 deletions mesonbuild/backend/ninjabackend.py
Original file line number Diff line number Diff line change
Expand Up @@ -2115,21 +2115,8 @@ def generate_single_compile(self, target, outfile, src, is_generated=False, head
raise AssertionError('BUG: broken generated source file handling for {!r}'.format(src))
else:
raise InvalidArguments('Invalid source type: {!r}'.format(src))
if isinstance(src, File):
if src.is_built:
src_filename = os.path.join(src.subdir, src.fname)
if os.path.isabs(src_filename):
assert(src_filename.startswith(self.environment.get_build_dir()))
src_filename = src_filename[len(self.environment.get_build_dir()) + 1:]
else:
src_filename = src.fname
elif os.path.isabs(src):
src_filename = os.path.basename(src)
else:
src_filename = src
obj_basename = src_filename.replace('/', '_').replace('\\', '_')
obj_basename = self.object_filename_from_source(target, src, self.is_unity(target))
rel_obj = os.path.join(self.get_target_private_dir(target), obj_basename)
rel_obj += '.' + self.environment.get_object_suffix()
dep_file = compiler.depfile_for_object(rel_obj)

# Add MSVC debug file generation compile flags: /Fd /FS
Expand Down

0 comments on commit b68cb3c

Please sign in to comment.