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

Do not special case the rewriting rule for the PKG_CONFIG_PATH environment variable #6002

Merged
merged 1 commit into from
Jun 7, 2024
Merged

Do not special case the rewriting rule for the PKG_CONFIG_PATH environment variable #6002

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion doc/pages/Manual.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -698,7 +698,7 @@ The `<path-format>` defines the way to handle variables path formatting:
any entries which include the separator character.

If a variable is not mentioned in `x-env-path-rewrite`, the separator is assumed to be `;` on Windows and `:` on all other systems; no slash or quoting transformations are performed. There are two special default cases:
* `PKG_CONFIG_PATH` uses `:` separator and is `target-quoted`
* `MANPATH` uses `:` separator and is `host`
* `PATH` on Windows uses `;` separator and is `target-quoted`

For example, on Windows:
Expand Down
1 change: 1 addition & 0 deletions master_changes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ users)
* [BUG] Fix incorrect reverting of `=+` and `=:` [#5935 @dra27 - fix #5926]
* For the `Cygwin` internal operator, don't allow `make.exe` to become shadowed [#5996 @dra27]
* [BUG] Fix incorrect quoting rule for `PKG_CONFIG_PATH` [#5972 @dra27 - partial fix for #5923]
* [BUG] Do not special case the rewriting rule for the PKG_CONFIG_PATH environment variable [#6002 @kit-ty-kate - fix #5923]

## Opamfile

Expand Down
2 changes: 1 addition & 1 deletion src/state/opamEnv.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ let default_sep_fmt_str var =
match String.uppercase_ascii var with
| "PATH" when Sys.win32 ->
SSemiColon, Target_quoted
| "PKG_CONFIG_PATH" | "MANPATH" ->
| "MANPATH" ->
SColon, Host
| _ -> default_separator, default_format

Expand Down
Loading