Add --with-private-runtime for mingw builds #3255
Merged
Conversation
This file contains 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
dra27
added a commit
to dra27/opam
that referenced
this pull request
Mar 17, 2018
dra27
force-pushed
the
private-runtime
branch
2 times, most recently
from
809cddc to
15287c3
Compare
AltGr
approved these changes
Mar 28, 2018
dra27
added a commit
to dra27/opam
that referenced
this pull request
Apr 4, 2018
At least that tests something!
s-expressions generated from config.status should depend on it (although, for now, shell/subst_var.ml still reads the source-tree version, not the captured one). This causes recompilation if configure is re-run.
If opam is compiled with the mingw-w64 version of Windows OCaml and an
internal solver, then additional DLLs are required at runtime. These can
either:
1. Be included in a directory in PATH (this is very bad, if done by
other packages)
2. Be included in the same directory as opam.exe (this is similarly
bad, because opam.exe is likely to end up in PATH)
3. Be manifested in another directory
The --with-private-runtime option sets up the appropriate DLLs in the
directory Opam.Runtime.amd64 (or Opam.Runtime.x86) and adds them and the
manifest to opam.install. It also overrides the manifest automatically
included by gcc to instruct the Windows loader to search for the DLLs in
the runtime directory.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 PR includes minor changes to
src/jbuildandsrc/core/jbuildwhich I noticed as part of this PR, but they're not related.The addition of the internal solver means that opam when compiled with the mingw version of OCaml needs runtime DLLs which are by default not available. The commit message for 1aeb5e7 expands on the detail of this, so I won't repeat it here.
Convincing Dune to feed a custom object file to ocamlopt requires a slightly bizarre contortion - it's accomplished by adding an empty generated module called
OpamManifestto the binary which itself depends on the manifest object. This is added on all platforms, but it's empty and is only part of the binary, not part of the opam-client library. It would be possible to eliminate that if at some point Dune permits arbitrary dependencies for theexecutablestanza.The manifest XML fragments look unnecessarily complicated, however they only change if Microsoft introduce a new version of Windows (very unlikely, since Windows 10 has been declared to be the "last" version) or the runtime DLLs for either of the architectures change name (which can happen, but not frequently). The detection logic for them may improve in the future... it's possible to use either
cygcheckordumpbinto determine the exact names required, but this already took enough time 🙂I also tweaked AppVeyor to demonstrate that the build doesn't work by default (see this AppVeyor log) and then tweak AppVeyor to configure the two mingw builds to use this new flag.
Reasons for choice of the parameter name (FWIW):
withrather thanenablebecause a third party library really is being pulled in here, rather than a switch being turned on (cf. `--enable-developer-mode)