Merge pull request #5755 from jorisa/fix-make-paths

Fix for #5676 make.py generates duplicate file entries in link_files.txt

Author: cmonr

tools/toolchains/__init__.py

@@ -819,7 +819,7 @@ def copy_files(self, files_paths, trg_path, resources=None, rel_path=None):
     def relative_object_path(self, build_path, base_dir, source):
         source_dir, name, _ = split_path(source)
 
-        obj_dir = join(build_path, relpath(source_dir, base_dir))
+        obj_dir = relpath(join(build_path, relpath(source_dir, base_dir)))
         if obj_dir is not self.prev_dir:
             self.prev_dir = obj_dir
             mkdir(obj_dir)