Skip to content

Commit 93a1653

Browse files
authored
Promote the toolchain feature flag to official feature (ocaml#11053)
* Promote toolchains from disabled to enabled by default Signed-off-by: Ambre Austen Suhamy <[email protected]> * Update flake.nix to not use deleted flag Signed-off-by: Ambre Austen Suhamy <[email protected]> --------- Signed-off-by: Ambre Austen Suhamy <[email protected]>
1 parent dc43cd7 commit 93a1653

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

boot/configure.ml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ let out =
1818
;;
1919

2020
let default_toggles : (string * [ `Disabled | `Enabled ]) list =
21-
[ "toolchains", `Disabled; "pkg_build_progress", `Disabled; "lock_dev_tool", `Disabled ]
21+
[ "toolchains", `Enabled; "pkg_build_progress", `Disabled; "lock_dev_tool", `Disabled ]
2222
;;
2323

2424
let toggles = ref default_toggles
@@ -89,8 +89,7 @@ let () =
8989
; ( "--toolchains"
9090
, toggle "toolchains"
9191
, " Enable the toolchains behaviour, allowing dune to install the compiler in a \
92-
user-wide directory.\n\
93-
\ This flag is experimental and shouldn't be relied on by packagers." )
92+
user-wide directory." )
9493
; ( "--pkg-build-progress"
9594
, toggle "pkg_build_progress"
9695
, " Enable the displaying of package build progress.\n\

flake.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@
6363
add-experimental-configure-flags = pkg: pkg.overrideAttrs {
6464
configureFlags =
6565
[
66-
"--toolchains" "enable"
6766
"--pkg-build-progress" "enable"
6867
"--lock-dev-tool" "enable"
6968
];

src/dune_rules/setup.defaults.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ let roots : string option Install.Roots.t =
1111
; libexec_root = None
1212
}
1313

14-
let toolchains = `Disabled
14+
let toolchains = `Enabled
1515
let pkg_build_progress = `Disabled
1616
let lock_dev_tool = `Disabled

0 commit comments

Comments
 (0)