Merged
Conversation
mato
reviewed
Apr 4, 2018
lib/mirage.ml
Outdated
| Bos.OS.Cmd.run Bos.Cmd.(v "ukvm-configure" % (libdir ^ "/src/ukvm") %% of_list ukvm_mods) >>= fun () -> | ||
| Bos.OS.Cmd.run Bos.Cmd.(v "make" % "-f" % "Makefile.ukvm" % "ukvm-bin") >>= fun () -> | ||
| Log.info (fun m -> m "linking with %a" Bos.Cmd.pp linker); | ||
| Bos.OS.Cmd.run linker >>= fun () -> |
Contributor
There was a problem hiding this comment.
@hannesm Maybe I'm misreading the diff, but won't this run the linker twice for ukvm? The first call is on line 1927 just before the if target = Ukvm.
Member
Author
There was a problem hiding this comment.
well spotted, I pushed 093ba78 which removes the second call to linker
Contributor
|
Tested this manually, LGTM, thanks! |
mato
pushed a commit
that referenced
this pull request
Jun 11, 2018
* respect ld from pkg-config * mirage: unify link step of solo5-*, add solo5_pkt : target -> string, string * mirage: avoid calling the linker twice (in the ukvm case), thx @mato
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
this is needed again for OpenBSD support in solo5 (since OpenBSD's
ldis an ancientGNU ld, which doesn't work with the solo5 linker script -- but theirld.lld(from clang/llvm) does..//cc @adamsteen @mato
this basically reverts e0aba4d -- but since
ldis no longer called via Makefile, but rather from OCaml code, it needs some adjustments.the failure semantics (if
pkg-configreturns an error) is atm to log (on the warning channel) and call out told.