File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -68,12 +68,6 @@ let split_ws str =
6868 done ;
6969 List. rev ! lst
7070
71- let add_compiler_args ~is_msvc ~cflags ~libs =
72- let module C = Configurator. V1 in
73- match is_msvc with
74- | true -> { C.Pkg_config. cflags; libs }
75- | false -> { C.Pkg_config. cflags = cflags @ [ " -fPIC" ; " -DPIC" ]; libs }
76-
7771let () =
7872 let module C = Configurator. V1 in
7973 C. main ~name: " sqlite3" (fun c ->
@@ -82,11 +76,6 @@ let () =
8276 | "macosx" -> true
8377 | _ -> false )
8478 in
85- let is_msvc =
86- opt_map (C. ocaml_config_var c " ccomp_type" ) ~default: false ~f: (function
87- | "msvc" -> true
88- | _ -> false )
89- in
9079 let is_mingw =
9180 opt_map (C. ocaml_config_var c " system" ) ~default: false ~f: (function
9281 | "mingw" | "mingw64" -> true
@@ -123,6 +112,5 @@ let () =
123112 | [ libs ] -> split_ws libs
124113 | _ -> failwith " pkg-config failed to return libs"
125114 in
126- let conf = add_compiler_args ~is_msvc ~cflags ~libs in
127- C.Flags. write_sexp " c_flags.sexp" conf.cflags;
128- C.Flags. write_sexp " c_library_flags.sexp" conf.libs)
115+ C.Flags. write_sexp " c_flags.sexp" cflags;
116+ C.Flags. write_sexp " c_library_flags.sexp" libs)
You can’t perform that action at this time.
0 commit comments