diff options
| author | omartijn <44672243+omartijn@users.noreply.github.com> | 2021-03-15 23:47:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-15 15:47:08 -0700 |
| commit | 24625921aa35488b26192f5837a56352a84ba756 (patch) | |
| tree | 64ad190bc265f3df3e34f8e7f188549ff2ad7ef5 /scripts | |
| parent | 5f3249e50ef94ad8b281053fd71453b58b7f4c3b (diff) | |
| download | vcpkg-24625921aa35488b26192f5837a56352a84ba756.tar.gz vcpkg-24625921aa35488b26192f5837a56352a84ba756.zip | |
[applocal.py] Don't try to install dependencies not managed by vcpkg (#16716)
This fixes build failures on osx when using dependencies not coming
from vcpkg (e.g. closed binaries). vcpkg tried to install those
dependencies (which fails because they're not where vcpkg expects them).
Fixes issue #8203
Co-authored-by: Martijn Otto <git@martijnotto.nl>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/buildsystems/osx/applocal.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/buildsystems/osx/applocal.py b/scripts/buildsystems/osx/applocal.py index e01223c7e..5237f1fdd 100644 --- a/scripts/buildsystems/osx/applocal.py +++ b/scripts/buildsystems/osx/applocal.py @@ -259,6 +259,11 @@ def fix_dependency(binary, dep): else: return True + # if the source path doesn't exist it's probably not a dependency + # originating with vcpkg and we should leave it alone + if not os.path.exists(qtnamesrc): + return True + dep_ok = True # check that rpath of 'dep' inside binary has been correctly set # (ie: relative to exepath using '@executable_path' syntax) @@ -417,4 +422,4 @@ def main(): if __name__ == "__main__": - main()
\ No newline at end of file + main() |