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

Jump to bottom

-custom-crt regression #58

Merged
merged 1 commit into from
Jul 31, 2018
Merged

-custom-crt regression #58

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
4 changes: 2 additions & 2 deletions reloc.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -698,12 +698,12 @@ let build_dll link_exe output_file files exts extra_args =

(* Iterates through DEFAULTLIB directives *)
let register_deflib fn =
if not (is_crt_lib fn) then
if not !custom_crt || not (is_crt_lib fn) then
let fn = find_file fn in
if not (Hashtbl.mem loaded_filenames fn)
then (Hashtbl.add loaded_filenames fn (); collect_file fn)
in
if not !builtin_linker && !use_default_libs && not !custom_crt then
if not !builtin_linker && !use_default_libs then
List.iter
(fun (cmd, args) ->
if String.uppercase_ascii cmd = "DEFAULTLIB" then List.iter register_deflib args
Expand Down