Fix configuration and build system for native Windows #2939
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
force-pushed
the
win-configure
branch
3 times, most recently
from
1c164d6
to
fd3b0e5
Compare
dra27
force-pushed
the
win-configure
branch
2 times, most recently
from
310d485
to
79e90bd
Compare
AltGr
reviewed
May 29, 2017
OCamlMakefile
Outdated
| @@ -112,7 +112,7 @@ endif | |||
|
|
|||
| #################### variables depending on your OCaml-installation | |||
|
|
|||
| SYSTEM := $(shell ocamlc -config 2>/dev/null | grep system | sed 's/system: //') | |||
| SYSTEM := $(shell ocamlc -config 2>/dev/null | grep "^system:" | sed 's/system: //') | |||
There was a problem hiding this comment.
I prefer a single | sed -n 's/^system: ?//p pipe (but this is fine)
There was a problem hiding this comment.
My way is sloppy - I've changed it!
|
Thanks! |
|
Ok to merge once the conflicts are fixed! |
configure can now identify i686-w64-mingw32-gcc. Code included to determine the value for AR from $OCAMLLIB/Makefile.config since OCamlMakefile insists on calling AR directly, rather than using ocamlmklib.
|
Fixed that pipe, and also 3 others! |
|
Do let this run through CI, therefore, just in case! |
|
gcc seems to be getting an option it doesn't like ( |
Test for ocamlc -config fails if your OCaml installation path includes "system"!
ocamldep needs to have the -slash option passed on Windows.
The Microsoft Linker is called link which has the potential to conflict with coreutils link, depending on the order of directories in PATH. By default, coreutils link will win, and compilation is broken on MSVC OCaml. Simply altering /etc/profile to put the Cygwin directories later isn't an option as commands like find and sort then get overridden by Microsoft's "alternative" implementations in system32. Introduce detection in configure so that if multiple link commands are found in PATH, identify the first one which is a Microsoft Linker and alter PATH in Makefile to include its directory first.
Autoconf's default prefix of /usr/local is inappropriate for Windows as it results in C:\usr\local being created by the opam-installer. When Windows is detected, the default is changed to C:/OPAM instead.
|
Oops - that's why we have CI! This should fix it - I'd put |
|
Can this one go in too, please? |
|
Yes, I had to re-run the AppVeyor builds but they seem OK now. |
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 has some duplication with #2938 over the
$(EXE)and$(WIN32)variables.This PR corrects the build system to operate in a preconfigured Cygwin set-up for a native OCaml compiler (at present, autodetection of the Microsoft C Compiler is not merged - as for OCaml, Cygwin must be started from within a Microsoft Developer Tools prompt or PATH, INCLUDE and LIB must be correctly set). This PR fixes various things and when combined with #2938 should allow opam to be built using either mingw or msvc via the lib-ext route (note: the compiled opam will not work). This PR changes the following:
msvs-promote-pathis used to allow the Microsoft Linker (link.exe) to be called even when Cygwin'slinkappears before it inPATHPREFIXis selected for Windows-building (I got tired of accidentally finding C:\usr had been created...)