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

Jump to bottom

Fix interpretation of / in META files #1889

Merged
1 commit merged into from Feb 27, 2019
Merged

Fix interpretation of / in META files #1889

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
7 changes: 7 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@ unreleased

- Format `dune printenv` output (#1867, fix #1862, @emillon)

1.7.3 (unreleased)
------------------

- Fix interpretation of `META` files containing archives with `/` in
the filename. For instance, this was causing llvm to be unusable
with dune (#1889, fix #1885, @diml)

- Make errors about menhir stanzas be located (#1881, fix #1876,
@diml)

Expand Down
7 changes: 6 additions & 1 deletion src/dune_package.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,12 @@ module Lib = struct
~foreign_archives ~jsoo_runtime ~main_module_name ~sub_systems
~requires ~ppx_runtime_deps ~implements ~virtual_ ~modules ~modes
~version ~orig_src_dir ~dir =
let map_path p = Path.relative dir (Path.basename p) in
let map_path p =
if Path.is_managed p then
Path.relative dir (Path.basename p)
else
p
in
let map_list = List.map ~f:map_path in
let map_mode = Mode.Dict.map ~f:map_list in
{ loc
Expand Down