diff options
| author | FranklinDM <mrmineshafter17@gmail.com> | 2022-08-17 19:54:01 +0800 |
|---|---|---|
| committer | FranklinDM <mrmineshafter17@gmail.com> | 2022-12-24 12:57:59 +0800 |
| commit | 84acd8c0ef8e27aab1b8e3a1db2e8a8e76e968d9 (patch) | |
| tree | e0a404856768b203c467f6f122ef23afdb711066 /python | |
| parent | fba59dfc4bb4e4e16831fc469265316a9bcfaaf9 (diff) | |
| download | uxp-84acd8c0ef8e27aab1b8e3a1db2e8a8e76e968d9.tar.gz | |
Issue #2065 - Part 5: Fix incorrect inclusion of base file name in destination path for generated FasterMake track files
I'm not sure about what they had in mind when they first wrote this, but this is completely unnecessary. The base name is the file name. This part will break building with `mach faster` once partial filenames with wildcards are included in the package manifest, which became the case when we began supporting the newer MSVC runtime.
This also aligns FasterMake with how RecursiveMake treats wildcard copy directives.
They fixed this in bug 1416465, but it included a conditional that will almost always be true and kept this incorrect joining of the path and base name in the destination path. Since the value for the base name is either empty or contains a partial file name, that conditional effectively does nothing.
Diffstat (limited to 'python')
| -rw-r--r-- | python/mozbuild/mozbuild/backend/fastermake.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/python/mozbuild/mozbuild/backend/fastermake.py b/python/mozbuild/mozbuild/backend/fastermake.py index d55928e8c7..0ca385187b 100644 --- a/python/mozbuild/mozbuild/backend/fastermake.py +++ b/python/mozbuild/mozbuild/backend/fastermake.py @@ -79,7 +79,7 @@ class FasterMakeBackend(CommonBackend, PartialBackend): .add_pattern_symlink( prefix, f.full_path[len(prefix):], - mozpath.join(path, f.target_basename)) + path) else: self._install_manifests[obj.install_target].add_symlink( f.full_path, |