Skip to content
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

Fix PATH for SharedModule in Windows devenv #14095

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix PATH for SharedModule in Windows devenv #14095

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 13 additions & 6 deletions mesonbuild/backend/backends.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2002,24 +2002,31 @@ def get_devenv(self) -> mesonlib.EnvironmentVariables:
library_paths = set()
host_machine = self.environment.machines[MachineChoice.HOST]
for t in self.build.get_targets().values():
in_default_dir = t.should_install() and not t.get_install_dir()[2]
if t.for_machine != MachineChoice.HOST or not in_default_dir:
if t.for_machine is not MachineChoice.HOST or not t.should_install():
continue

if (host_machine.is_windows() or host_machine.is_cygwin()) and isinstance(t, (build.Executable, build.SharedModule)):
# On windows we cannot rely on rpath to run executables from build
# directory. We have to add in PATH the location of every DLL needed.
library_paths.update(self.determine_windows_extra_paths(t, []))

if t.get_install_dir()[2]:
# Do not update paths for target installed in non default location
continue

tdir = os.path.join(self.environment.get_build_dir(), self.get_target_dir(t))
if isinstance(t, build.Executable):
# Add binaries that are going to be installed in bindir into PATH
# so they get used by default instead of searching on system when
# in developer environment.
extra_paths.add(tdir)
if host_machine.is_windows() or host_machine.is_cygwin():
# On windows we cannot rely on rpath to run executables from build
# directory. We have to add in PATH the location of every DLL needed.
library_paths.update(self.determine_windows_extra_paths(t, []))

elif isinstance(t, build.SharedLibrary):
# Add libraries that are going to be installed in libdir into
# LD_LIBRARY_PATH. This allows running system applications using
# that library.
library_paths.add(tdir)

return self.environment.get_env_for_paths(library_paths, extra_paths)

def compiler_to_generator_args(self, target: build.BuildTarget,
Expand Down
Loading