@@ 644,14 644,7 @@ let merge_pins_with_selector_deps pins p
| Some _ ->
acc
| None when Generate_io.Pds_conf.only_in_default_selector v pds_conf ->
- let used_selectors =
- String_set.elements pds_conf.Generate_io.Pds_conf.used_selectors
- in
- if used_selectors <> [] then
- let pin = "!(" ^ (String.concat " | " used_selectors) ^ ")" in
- String_map.add dep pin acc
- else
- acc
+ acc
| None when Generate_io.Pds_conf.has_default_selector v pds_conf ->
let used_selectors = pds_conf.Generate_io.Pds_conf.used_selectors in
let v = String_set.of_list (Generate_io.Pds_conf.remove_default_selector v pds_conf) in
@@ 664,7 657,7 @@ let merge_pins_with_selector_deps pins p
else
acc
| None ->
- let pin = String.concat " | " v in
+ let pin = String.concat " | " (List.map (Printf.sprintf "os = \"%s\"") v) in
String_map.add dep pin acc)
pds_conf.Generate_io.Pds_conf.deps
pins
@@ 676,14 669,7 @@ let merge_pins_with_selector_deps pins p
| Some _ ->
acc
| None when Generate_io.Pds_conf.only_in_default_selector v pds_conf ->
- let used_selectors =
- String_set.elements pds_conf.Generate_io.Pds_conf.used_selectors
- in
- if used_selectors <> [] then
- let pin = "test & !(" ^ (String.concat " | " used_selectors) ^ ")" in
- String_map.add dep pin acc
- else
- acc
+ acc
| None when Generate_io.Pds_conf.has_default_selector v pds_conf ->
let selectors = pds_conf.Generate_io.Pds_conf.selectors in
let v = String_set.of_list (Generate_io.Pds_conf.remove_default_selector v pds_conf) in