Skip to content

Commit

Permalink
Promote the toolchain feature flag to official feature (ocaml#11053)
Browse files Browse the repository at this point in the history
* Promote toolchains from disabled to enabled by default

Signed-off-by: Ambre Austen Suhamy <ambre@tarides.com>

* Update flake.nix to not use deleted flag

Signed-off-by: Ambre Austen Suhamy <ambre@tarides.com>

---------

Signed-off-by: Ambre Austen Suhamy <ambre@tarides.com>
  • Loading branch information
ElectreAAS authored Oct 31, 2024
1 parent dc43cd7 commit 93a1653
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
5 changes: 2 additions & 3 deletions boot/configure.ml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ let out =
;;

let default_toggles : (string * [ `Disabled | `Enabled ]) list =
[ "toolchains", `Disabled; "pkg_build_progress", `Disabled; "lock_dev_tool", `Disabled ]
[ "toolchains", `Enabled; "pkg_build_progress", `Disabled; "lock_dev_tool", `Disabled ]
;;

let toggles = ref default_toggles
Expand Down Expand Up @@ -89,8 +89,7 @@ let () =
; ( "--toolchains"
, toggle "toolchains"
, " Enable the toolchains behaviour, allowing dune to install the compiler in a \
user-wide directory.\n\
\ This flag is experimental and shouldn't be relied on by packagers." )
user-wide directory." )
; ( "--pkg-build-progress"
, toggle "pkg_build_progress"
, " Enable the displaying of package build progress.\n\
Expand Down
1 change: 0 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
add-experimental-configure-flags = pkg: pkg.overrideAttrs {
configureFlags =
[
"--toolchains" "enable"
"--pkg-build-progress" "enable"
"--lock-dev-tool" "enable"
];
Expand Down
2 changes: 1 addition & 1 deletion src/dune_rules/setup.defaults.ml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ let roots : string option Install.Roots.t =
; libexec_root = None
}

let toolchains = `Disabled
let toolchains = `Enabled
let pkg_build_progress = `Disabled
let lock_dev_tool = `Disabled

0 comments on commit 93a1653

Please sign in to comment.