Add rule for bc-for-jsoo target only when performing whole program compilation #10693
Conversation
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
hhugo
reviewed
Jul 5, 2024
| let modes = | ||
| if Mode_conf.Set.mem info.modes Javascript | ||
| then Mode_conf.Set.add info.modes Byte | ||
| else info.modes |
There was a problem hiding this comment.
I guess this logic has been wrong for a while
There was a problem hiding this comment.
Can we add a test demonstrating the effects of this removal ?
There was a problem hiding this comment.
File "test/blackbox-tests/test-cases/jsoo/inline-tests.t/run.t", line 1, characters 0-0:
------ test/blackbox-tests/test-cases/jsoo/inline-tests.t/run.t
++++++ test/blackbox-tests/test-cases/jsoo/inline-tests.t/run.t.corrected
File "test/blackbox-tests/test-cases/jsoo/inline-tests.t/run.t", line 8, characters 0-1:
|Run inline tests using node js
|
| $ cat >dune-project <<EOF
| > (lang dune 2.6)
| > EOF
|
+| $ dune build js/.inline_tests_js.inline-tests/inline_test_runner_inline_tests_js.bc --display short
+| Error: Don't know how to build
+| js/.inline_tests_js.inline-tests/inline_test_runner_inline_tests_js.bc
+| [1]
|There was a problem hiding this comment.
Thanks for the test. I have added it.
hhugo
reviewed
Jul 5, 2024
52aad68 to
88acc3d
Compare
hhugo
reviewed
Jul 5, 2024
src/dune_rules/exe_rules.ml
Outdated
| then Exe.Linkage.byte_for_jsoo :: modes | ||
| then ( | ||
| match jsoo_compilation_mode with | ||
| | Js_of_ocaml.Compilation_mode.Whole_program -> Exe.Linkage.byte_for_jsoo :: modes |
There was a problem hiding this comment.
Could we use type disambiguation to avoid the Js_of_ocaml.Compilation_mode prefix.
- ~jsoo_compilation_mode
+ ~(jsoo_compilation_mode : Js_of_ocaml.Compilation_mode.t)There was a problem hiding this comment.
Indeed. I have made the change.
hhugo
approved these changes
Jul 5, 2024
…mpilation Signed-off-by: Jérôme Vouillon <jerome.vouillon@gmail.com>
hhugo
approved these changes
Jul 6, 2024
anmonteiro
pushed a commit
to anmonteiro/dune
that referenced
this pull request
Nov 17, 2024
…mpilation (ocaml#10693) Signed-off-by: Jérôme Vouillon <jerome.vouillon@gmail.com>
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.
@hhugo Can you have a look?