Fix ocaml-system and ocaml scripts for Windows #3337
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
Mangling done with converting Sys.executable_name needs to account for the .exe extension on Windows. Additionally, when querying ocamlc -where, the script should read the answer in text-mode in order to avoid problems with \r characters. Signed-off-by: David Allsopp <david.allsopp@metastack.com>
|
Thanks! |
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.
The config-generation scripts in the
ocamlandocaml-systempackages don't take the.exeextension on Windows and Cygwin into account. Proposing this now to solve Cygwin, as that should be otherwise working in 2.0.0.The
set_binary_mode_inis for native Windows - it should have no effect on any other platform, but on Windows it will cause the trailing\rin the output ofocamlc -whereto be stripped (which is the behaviour required).