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.

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

Fix MSVC build #6517

Merged
merged 5 commits into from
Nov 19, 2022
Merged

Fix MSVC build #6517

merged 5 commits into from
Nov 19, 2022

Conversation

nojb
Copy link
Collaborator

@nojb nojb commented Nov 19, 2022

The current main does not build under MSVC:

ocamlc -output-complete-exe -w -24 -g -o .duneboot.exe -I boot unix.cma boot/libs.ml boot/duneboot.ml
.\.duneboot.exe
cd _boot && C:\cygwin64\home\nojebar\mlfi\mlfi-ins\bin\ocamlopt.opt.exe -o ../_boot\dune.exe -g -I +threads unix.cmxa threads.cmxa -no-alias-deps -w -49-6 readdir.c wait3_stubs.c xdg_stubs.c dune_flock.c spawn_stubs.c dune_stats_stubs.c fsevents_stubs.c inotify_stubs.c pthread_chdir_stubs.c -args mods_list -cclib -lshell32 -cclib -lole32 -cclib -luuid -alert -unstable
C:\cygwin64\home\nojebar\dune-poll\dune\_boot\src\dune_util\dune_flock.c(33) : error C2220: l'avertissement suivant est traité comme une erreur
C:\cygwin64\home\nojebar\dune-poll\dune\_boot\src\dune_util\dune_flock.c(49) : error C2220: l'avertissement suivant est traité comme une erreur
C:\cygwin64\home\nojebar\dune-poll\dune\_boot\src\dune_util\dune_flock.c(33) : warning C4716: 'dune_flock_lock' : doit retourner une valeur
C:\cygwin64\home\nojebar\dune-poll\dune\_boot\src\dune_util\dune_flock.c(49) : warning C4716: 'dune_flock_unlock' : doit retourner une valeur
make: *** [Makefile:49: _boot/dune.exe] Error 2

Signed-off-by: Nicolás Ojeda Bär <n.oje.bar@gmail.com>
@nojb
Copy link
Collaborator Author

nojb commented Nov 19, 2022

If I understand correctly this is included in 3.6.0 (#6360), so it will need a bugfix release. cc @emillon.

nojb added 2 commits November 19, 2022 19:25
Signed-off-by: Nicolás Ojeda Bär <n.oje.bar@gmail.com>
Signed-off-by: Nicolás Ojeda Bär <n.oje.bar@gmail.com>
@rgrinberg
Copy link
Member

Can we test MSVC in CI as well?

@nojb
Copy link
Collaborator Author

nojb commented Nov 19, 2022

Can we test MSVC in CI as well?

Not with any existing prepackaged workflow, as far as I know. The closest we have (again, as far as I know) is @jonahbeckford's https://github.com/diskuv/dkml-workflows (which is currently on 4.12 and is somewhat slow due to various technical reasons).

cc @jonahbeckford @dra27

@nojb nojb merged commit d81b168 into ocaml:main Nov 19, 2022
@nojb nojb deleted the msvc_flock branch November 19, 2022 20:43
@emillon emillon added this to the 3.6.1 milestone Nov 22, 2022
emillon pushed a commit to emillon/dune that referenced this pull request Nov 24, 2022
Signed-off-by: Nicolás Ojeda Bär <n.oje.bar@gmail.com>
emillon added a commit that referenced this pull request Nov 24, 2022
Signed-off-by: Nicolás Ojeda Bär <n.oje.bar@gmail.com>
emillon added a commit that referenced this pull request Nov 24, 2022
Signed-off-by: Nicolás Ojeda Bär <n.oje.bar@gmail.com>

Signed-off-by: Nicolás Ojeda Bär <n.oje.bar@gmail.com>
emillon added a commit to emillon/opam-repository that referenced this pull request Nov 24, 2022
…ne-site, dune-rpc, dune-rpc-lwt, dune-private-libs, dune-glob, dune-configurator, dune-build-info, dune-action-plugin and chrome-trace (3.6.1)

CHANGES:

- Fix status line enabled when ANSI colors are forced. (ocaml/dune#6503, @MisterDA)

- Fix build with MSVC compiler (ocaml/dune#6517, @nojb)

- Do not shadow library interface modules (ocaml/dune#6549, fixes ocaml/dune#6545, @rgrinberg)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants