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

Fix remaining conflicts in utils/ #170

Merged
merged 1 commit into from
Oct 18, 2023
Merged

Fix remaining conflicts in utils/ #170

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
20 changes: 2 additions & 18 deletions utils/ccomp.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,20 +143,9 @@ let create_archive archive file_list =
| _ ->
assert(String.length Config.ar > 0);
command(Printf.sprintf "%s rc %s %s"
<<<<<<< HEAD
Config.ar quoted_archive (quote_files file_list))
||||||| merged common ancestors
let r1 =
command(Printf.sprintf "%s rc %s %s"
Config.ar quoted_archive (quote_files file_list)) in
if r1 <> 0 || String.length Config.ranlib = 0
then r1
else command(Config.ranlib ^ " " ^ quoted_archive)
=======
Config.ar quoted_archive
(quote_files ~response_files:Config.ar_supports_response_files
file_list))
>>>>>>> ocaml/5.1

let expand_libname cclibs =
cclibs |> List.map (fun cclib ->
Expand Down Expand Up @@ -210,14 +199,9 @@ let call_linker ?(native_toplevel = false) mode output_name files extra =
)
(Filename.quote output_name)
"" (*(Clflags.std_include_flag "-I")*)
<<<<<<< HEAD
(if native_toplevel then ""
else quote_prefixed "-L" (Load_path.get_paths ()))
||||||| merged common ancestors
(quote_prefixed "-L" (Load_path.get_paths ()))
=======
(quote_prefixed ~response_files:true "-L" (Load_path.get_paths ()))
>>>>>>> ocaml/5.1
else
quote_prefixed ~response_files:true "-L" (Load_path.get_paths ()))
(String.concat " " (List.rev !Clflags.all_ccopts))
(quote_files ~response_files:true files)
extra
Expand Down
10 changes: 0 additions & 10 deletions utils/consistbl.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,22 +63,12 @@ end) = struct
with Not_found ->
raise (Not_available name)

<<<<<<< HEAD
let set tbl name data crc source = Module_name.Tbl.add tbl name (data, crc, source)

let source tbl name = thd3 (Module_name.Tbl.find tbl name)

let find t name =
match Module_name.Tbl.find t name with
| exception Not_found -> None
| (data, crc, _) -> Some (data, crc)
||||||| merged common ancestors
let set tbl name crc source = Module_name.Tbl.add tbl name (crc, source)

let source tbl name = snd (Module_name.Tbl.find tbl name)
=======
let source tbl name = snd (Module_name.Tbl.find tbl name)
>>>>>>> ocaml/5.1

let extract l tbl =
let l = List.sort_uniq Module_name.compare l in
Expand Down