Merge branch 'master' into path-table
This commit is contained in:
commit
2a85cbe074
|
@ -324,8 +324,13 @@ let gen_rules sctx components =
|
||||||
|
|
||||||
let ppx_driver_exe sctx libs ~dir_kind =
|
let ppx_driver_exe sctx libs ~dir_kind =
|
||||||
let names =
|
let names =
|
||||||
List.rev_map libs ~f:Lib.name
|
let names = List.rev_map libs ~f:Lib.name in
|
||||||
|> List.sort ~compare:String.compare
|
match (dir_kind : File_tree.Dune_file.Kind.t) with
|
||||||
|
| Dune -> List.sort names ~compare:String.compare
|
||||||
|
| Jbuild ->
|
||||||
|
match names with
|
||||||
|
| last :: others -> List.sort others ~compare:String.compare @ [last]
|
||||||
|
| [] -> []
|
||||||
in
|
in
|
||||||
let scope_for_key =
|
let scope_for_key =
|
||||||
List.fold_left libs ~init:None ~f:(fun acc lib ->
|
List.fold_left libs ~init:None ~f:(fun acc lib ->
|
||||||
|
|
Loading…
Reference in New Issue