Merge pull request #1142 from rgrinberg/drop-prefix-simplify
Fix msvc_hack_cclibs using combinators
This commit is contained in:
commit
ce0042bbe5
|
@ -17,21 +17,14 @@ module Gen (P : Install_rules.Params) = struct
|
||||||
| Library stuff |
|
| Library stuff |
|
||||||
+-----------------------------------------------------------------+ *)
|
+-----------------------------------------------------------------+ *)
|
||||||
|
|
||||||
let msvc_hack_cclibs cclibs =
|
let msvc_hack_cclibs =
|
||||||
let f lib =
|
List.map ~f:(fun lib ->
|
||||||
if String.is_prefix lib ~prefix:"-l" then
|
let lib =
|
||||||
String.sub lib ~pos:2 ~len:(String.length lib - 2) ^ ".lib"
|
match String.drop_prefix lib ~prefix:"-l" with
|
||||||
else
|
| None -> lib
|
||||||
lib
|
| Some l -> l ^ ".lib"
|
||||||
in
|
in
|
||||||
let cclibs = List.map cclibs ~f in
|
Option.value ~default:lib (String.drop_prefix ~prefix:"-l" lib))
|
||||||
let f lib =
|
|
||||||
if String.is_prefix lib ~prefix:"-l" then
|
|
||||||
String.sub lib ~pos:2 ~len:(String.length lib - 2)
|
|
||||||
else
|
|
||||||
lib
|
|
||||||
in
|
|
||||||
List.map cclibs ~f
|
|
||||||
|
|
||||||
let build_lib (lib : Library.t) ~scope ~flags ~dir ~obj_dir ~mode
|
let build_lib (lib : Library.t) ~scope ~flags ~dir ~obj_dir ~mode
|
||||||
~top_sorted_modules ~modules =
|
~top_sorted_modules ~modules =
|
||||||
|
|
Loading…
Reference in New Issue