Skip to content

osxbundle: fix vulkan loader and search paths #18226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kasper93 merged 2 commits into from
Jul 6, 2026
Merged

osxbundle: fix vulkan loader and search paths #18226

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a2a85b
osxbundle: fix a wrong vulkan search path
Akemi Mar 14, 2026
97a0ab8
osxbundle: fix vulkan loader search path check
Akemi Mar 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions TOOLS/dylib_unhell.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,30 +218,32 @@ def process_vulkan_loader(binary, loader_name, loader_relative_folder, library_n
os.path.join("/etc", loader_relative_folder),
os.path.join(os.path.expanduser("~"), ".local/share", loader_relative_folder),
os.path.join("/usr/local/share", loader_relative_folder),
os.path.join("/usr/share/vulkan", loader_relative_folder),
os.path.join("/usr/share", loader_relative_folder),
os.path.join(get_homebrew_prefix(), "etc", loader_relative_folder),
os.path.join(get_homebrew_prefix(), "share", loader_relative_folder), # old location
]

loader_system_folder = ""
loader_system_path = ""
for loader_system_search_folder in loader_system_search_folders:
if os.path.exists(loader_system_search_folder):
loader_system_folder = loader_system_search_folder
break
if os.path.exists(os.path.join(loader_system_folder, loader_name)):
loader_system_path = os.path.join(loader_system_folder, loader_name)
break

if not loader_system_folder:
print(">>> could not find loader folder " + loader_relative_folder)
return

if not loader_system_path:
print(">>> could not find loader " + loader_name)
return

loader_bundle_folder = os.path.join(resources_path(binary), loader_relative_folder)
loader_system_path = os.path.join(loader_system_folder, loader_name)
loader_bundle_path = os.path.join(loader_bundle_folder, loader_name)
library_relative_folder = "../../../Frameworks/"

if not os.path.exists(loader_system_path):
print(">>> could not find loader " + loader_name)
return

if not os.path.exists(loader_bundle_folder):
os.makedirs(loader_bundle_folder)

Expand Down
Loading