Browse files

Use target_basename.o style names for object files.

This is a temporary solution for conflicts between identically named
source files in different targets. It will be removed once proper
filename conflicts resolution is implemented.
  • Loading branch information...
1 parent 45b6ab0 commit 6584f82be7fb3d13dfd02f7c2b76ad2c8300fc0f @vslavik committed Apr 8, 2012
Showing with 3 additions and 1 deletion.
  1. +3 −1 src/bkl/compilers.py
View
4 src/bkl/compilers.py
@@ -138,7 +138,9 @@ def _make_build_nodes_for_file(toolset, target, srcfile, ft_to):
assert isinstance(src, expr.PathExpr)
ext = src.get_extension()
- objname = expr.PathExpr([expr.LiteralExpr(src.get_basename())],
+ # FIXME: don't use target_basename.o form for object files, use just the basename,
+ # unless there's a conflict
+ objname = expr.PathExpr([expr.LiteralExpr("%s_%s" % (target.name, src.get_basename()))],
expr.ANCHOR_BUILDDIR,
pos=src.pos).change_extension(ft_to.extensions[0])

0 comments on commit 6584f82

Please sign in to comment.