Fix install of symlinks with installopt but without installoptopt#932
Fix install of symlinks with installopt but without installoptopt#932dra27 merged 1 commit intoocaml:trunkfrom
Conversation
|
(I suppose the reason no one hit this before is that the chief reason to have ocamlopt but not ocamlopt.opt is cross-compilation...) |
|
I'm not fond of the fact that your solution implies that the order in which you run the What about "make the test more clever"? It seems to me that the code previously had a kind of "if The specification I would expect is the following one:
It is not followed today, but it does not sound hard to follow it. Or maybe this rule is too simplistic for cross-compilation scenarios? |
Unless I'm missing something, this is not the case, because That said, your solution does seem more elegant to me also, so I can do that. |
whitequark
force-pushed
the
installopt
branch
from
d5cc68f to
238679f
Compare
|
@gasche Done. Remarkably the patch even became simpler. |
Makefile
Outdated
| ln -sf ocamlc.byte$(EXE) ocamlc$(EXE); \ | ||
| ln -sf ocamlopt.byte$(EXE) ocamlopt$(EXE); \ | ||
| ln -sf ocamllex.byte$(EXE) ocamllex$(EXE); \ | ||
| fi |
whitequark
force-pushed
the
installopt
branch
from
238679f to
911f337
Compare
| ln -sf ocamlc.byte$(EXE) ocamlc$(EXE); \ | ||
| ln -sf ocamllex.byte$(EXE) ocamllex$(EXE); \ | ||
| fi | ||
| fi |
There was a problem hiding this comment.
FWIW The indentation of this one was correct, it's the three lines above which should be indented 😄
There was a problem hiding this comment.
This makes no sense, this conditional is exactly the same as the one ending on line 282.
There was a problem hiding this comment.
Sorry - just looked at the raw file. GitHub (or my browser) is rendering the diff view badly - lines 253-256 are showing at the same indentation. Sorry for the noise...
|
@gasche - is a Changes entry needed for this, in your opinion? |
|
That's up to @whitequark preference, but my inclination would be "yes": this change fixes an user-observable issue -- so observable that the observers decided to fix the behavior. (It could go in "Bug fixes" or "Compiler distribution build system".) |
whitequark
force-pushed
the
installopt
branch
from
911f337 to
90bbde7
Compare
|
@gasche I have no real preference beyond having the bug fixed but your reasoning is convincing. |
|
All looks good, thanks! |
…rade Upgrade to OCaml 4.14
Upgrade to OCaml 4.14
b11eea1 flambda-backend: Introduce Import_info (ocaml#1036) bc5b135 flambda-backend: Fix `ocamlobjinfo` on flambda2 .cmx files (ocaml#1029) c8babbd flambda-backend: Compilation_unit optimisations (ocaml#1035) e8d3e22 flambda-backend: Use 4.14.0 opam switch for building (includes upgrading ocamlformat to 0.24.1) (ocaml#1030) eb14a86 flambda-backend: Port PR81 from ocaml-jst (ocaml#1024) 131bc12 flambda-backend: Merge ocaml-jst 2022-12-13 (ocaml#1022) 06c189a flambda-backend: Make stack allocation the default (ocaml#1013) 98debd5 flambda-backend: Initial support for value slots not of value kind (ocaml#946) deb1714 flambda-backend: Add is_last flag to closinfo words (ocaml#938) d07fce1 flambda-backend: Disable poll insertion in Configure (ocaml#967) 0f1ce0e flambda-backend: Regenerate ocaml/configure autoconf 2.69 (instead of 2.71) (ocaml#1012) 27132d8 flambda-backend: Fix for spurious typing error related to expanding through functor arguments (ocaml#997) 724fb68 flambda-backend: Use `Compilation_unit.t` instead of `Ident.t` for globals (ocaml#871) 396d5b8 flambda-backend: Add a test for frametable setup in natdynlinked libraries (ocaml#983) b73ab12 flambda-backend: Fix invocation of `caml_shared_startup` in native dynlink (ocaml#980) 7c7d75a flambda-backend: Fix split_default_wrapper which did not trigger anymore with flambda2 (ocaml#970) 8fb75bd flambda-backend: Port ocaml#11727 and ocaml#11732 (ocaml#965) fdb7987 flambda-backend: Fix include functor issue after 4.14 merge. (ocaml#948) 9745cdb flambda-backend: Print -dprofile/-dtimings output to stdout like 4.12 (ocaml#943) 5f51f21 flambda-backend: Merge pull request ocaml#932 from mshinwell/4.14-upgrade 841687d flambda-backend: Run make alldepend in ocaml/ (ocaml#936) 72a7658 flambda-backend: Remove reformatting changes only in dynlink/dune (preserving PR889 and adjusting to minimise diff) 6d758cd flambda-backend: Revert whitespace changes in dune files, to match upstream c86bf6e flambda-backend: Remove duplicate tests for polling 971dbeb flambda-backend: Testsuite fixes 32f8356 flambda-backend: Topeval fix for symbols patch befea01 flambda-backend: Compilation fixes / rectify merge faults a84543f flambda-backend: Merge ocaml-jst 8e65056 flambda-backend: Merge ocaml-jst 4d70045 flambda-backend: Remove filename from system frametable (amd64) (ocaml#920) 5e57b7d flambda-backend: Bugfix for runtime frame_descr logic for C frames (ocaml#918) 6423d5e flambda-backend: Merge pull request ocaml#914 from mshinwell/merge-ocaml-jst-2022-10-24 ead605c flambda-backend: Add a missing Extract_exception (ocaml#916) c8f1481 flambda-backend: Resolve conflicts and add specialise/specialised attributes to Builtin_attributes cf4d0d3 flambda-backend: Merge fixes (ocaml#21) c2f742f flambda-backend: Re-enable some tests for Flambda2 (ocaml#881) 3d38d13 flambda-backend: Long frames in frametable (ocaml#797) 85aec7b flambda-backend: Add loop attribute to Builtin_attributes c0f16e3 flambda-backend: Compilation fixes 90dea23 flambda-backend: Merge flambda-backend/main 5acc6ea flambda-backend: Fixes after merge e501946 flambda-backend: Merge ocaml-jst 115083b flambda-backend: Merge ocaml-jst 9943b2e flambda-backend: Revert "Revert "Transform tail-recursive functions into recursive continuations (ocaml#893)"" (ocaml#909) ce339f1 flambda-backend: Fix alloc modes and call kinds for overapplications (ocaml#902) e6a317c flambda-backend: Revert "Transform tail-recursive functions into recursive continuations (ocaml#893)" 853c488 flambda-backend: Transform tail-recursive functions into recursive continuations (ocaml#893) 5a977e4 flambda-backend: Fix missing End_region primitives on switch arms (ocaml#898) 7fa7f9d flambda-backend: Add missing dependencies to Dune files (ocaml#889) 3cd36f0 flambda-backend: Have Lambda `Pgetglobal` and `Psetglobal` take `Compilation_unit.t` (ocaml#896) 7565915 flambda-backend: [@poll error] attribute (ocaml#745) 9eb9448 flambda-backend: Backport the main safepoints PRs (ocaml#740) 689bdda flambda-backend: Add strict mode for ocamldep (ocaml#892) git-subtree-dir: ocaml git-subtree-split: b11eea1
* remove fallback to pre-odoc-2.2.0 docs-data
3 participants
Since the
ocamlc -> ocamlc.bytesymlink is not installed when ocamlopt exists, building ocamlopt, but not *.opt compilers, results in no ocamlc symlink being installed at all. Since ln -sf is already used everywhere, just make the code less clever, and let the symlink be overwritten when appropriate.