Skip to content

Fix parallel make #64

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

Merged
merged 1 commit into from
Jun 29, 2021
Merged

Fix parallel make #64

merged 1 commit into from
Jun 29, 2021

Conversation

lthls
Copy link
Contributor

@lthls lthls commented Jun 29, 2021

The two rules ocaml/otherlibs/dynlink/natdynlinkops2 and flags.sexp could cause errors if run in parallel, so I've merged them into a single config_files rule.

@mshinwell mshinwell merged commit 2846c72 into ocaml-flambda:4.12 Jun 29, 2021
poechsel pushed a commit that referenced this pull request Jun 30, 2021
@dra27 dra27 mentioned this pull request Jun 30, 2021
@dra27
Copy link
Collaborator

dra27 commented Jun 30, 2021

Can this be cherry-picked to 4.11 as well, please?

ccasin added a commit to ccasin/flambda-backend that referenced this pull request Mar 12, 2023
5e7dfce331 Merge flambda-backend changes
9f7f2d24a7 Edit script for test merge
1ae71ce59d Review comments (ocaml-flambda#6)
1845365bd0 Layouts version 1
aba6294 Immediacy rework (ocaml-flambda#122)
cf4eeef Add no-stack-allocation variant of some tests that print lambda (ocaml-flambda#133)
8f22438 Fully switch over Jane Street Merlin support to `.local-*` (ocaml-flambda#136)
5482a8d Remove `Lev_module_definition` from lambda (ocaml-flambda#135)
261e016 Change modular extensions to produce `AST_desc` types (ocaml-flambda#132)
0760c82 Disable module patterns in comprehensions (ocaml-flambda#131)
6acac80 Add Ctype global state debug printers (ocaml-flambda#130)
bc32037 Enable support for Jane Street's internal Merlin configuration (ocaml-flambda#64)
d1a8d03 Split out `Clflags.Extension` into a new file, `Language_extension` (ocaml-flambda#125)
435de6d Fix bootstrap and add legacy CI (ocaml-flambda#126)
7e5a626 Improve the API of language extensions to better support upstream compatibility (and also tooling) (ocaml-flambda#13)
c4e17b0 Replace var with local for faster mode checking (ocaml-flambda#53)
6d477d8 Merge pull request ocaml-flambda#124 from riaqn/merge-backend
d737533 minor fixes after merge
f1710d6 Merge flambda-backend changes
cc18534 Just run make boostrap (ocaml-flambda#123)

git-subtree-dir: ocaml
git-subtree-split: 5e7dfce331d0e39c695fab9b00e3d2cda7d9ebb4
ccasin added a commit that referenced this pull request Mar 24, 2023
ea89813 Merge pull request #154 from ocaml-flambda/merge-flambda-backend
23cf5a5 Merge flambda-backend changes
b3af0c4 Unboxed types version 3 tests (#82)
1282d16 Functions with no clauses aren't local-returning (#149)
15d38c0 `make install` puts ocamlc at workspace root (#152)
b4928ee Remove -absname to improve build errors (#151)
f5b5e49 Remove `type_unpacks` (#150)
50d54db Remove arity-interrupting elaboration of module patterns (#146)
4382869 Remove the need to manually update the `tools/debug_printers` file (#148)
06a1d91 Add `promote-failed` targets to the Makefiles (#144)
d04eb58 Cleanup of comprehensions and immutable arrays (#127)
a45df79 Add a Module_strengthening extension (#142)
163c4b9 Add support for extensions in module types (#141)
74aa974 Some small patch-ups around matching on extensions (#140)
07127fe Remove raw_body from modular extensions setup (#137)
3f9bd64 Don't copy when resolving aliases in try_modtypes (#143)
aba6294 Immediacy rework (#122)
cf4eeef Add no-stack-allocation variant of some tests that print lambda (#133)
8f22438 Fully switch over Jane Street Merlin support to `.local-*` (#136)
5482a8d Remove `Lev_module_definition` from lambda (#135)
261e016 Change modular extensions to produce `AST_desc` types (#132)
0760c82 Disable module patterns in comprehensions (#131)
6acac80 Add Ctype global state debug printers (#130)
bc32037 Enable support for Jane Street's internal Merlin configuration (#64)
d1a8d03 Split out `Clflags.Extension` into a new file, `Language_extension` (#125)
435de6d Fix bootstrap and add legacy CI (#126)
7e5a626 Improve the API of language extensions to better support upstream compatibility (and also tooling) (#13)
c4e17b0 Replace var with local for faster mode checking (#53)
6d477d8 Merge pull request #124 from riaqn/merge-backend
d737533 minor fixes after merge
f1710d6 Merge flambda-backend changes
cc18534 Just run make boostrap (#123)

git-subtree-dir: ocaml
git-subtree-split: ea89813
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.

4 participants