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.

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 Windows double-adjustment of PATH #20

Merged
merged 5 commits into from
Oct 13, 2020
Merged

Conversation

staticfloat
Copy link
Member

On windows, LIBPATH_env == "PATH", and we don't want to
double-adjust PATH.

On windows, `LIBPATH_env` == `"PATH"`, and we don't want to
double-adjust `PATH`.  We need to be careful around the `adjust_XXX`
flags here, to ensure that if we don't want to adjust `LIBPATH` but do
want to adjust `PATH` (as much as that makes sense on Windows) we only
use the `PATH_list` and not the `LIBPATH_list`
@giordano
Copy link
Member

For our own record, this is basically the same as JuliaPackaging/BinaryBuilder.jl#541, needed in particular by FFMPEG on Windows (throwing some keywords so that's easier to find the next time we'll need to do the same).

Copy link
Member

@giordano giordano left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please bump the version number in Project.toml so that we can register it straight away? Also, a test that Sys.BINDIR is in JLLWrappers.get_julia_libpaths() on Windows would be good.

test/runtests.jl Outdated Show resolved Hide resolved
@giordano giordano merged commit 141037f into master Oct 13, 2020
@giordano giordano deleted the sf/dont_adjust_twice branch October 13, 2020 23:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants