Skip to content

Commit

Permalink
Changes
Browse files Browse the repository at this point in the history
Signed-off-by: Nicolás Ojeda Bär <n.oje.bar@gmail.com>
  • Loading branch information
nojb committed Sep 5, 2024
1 parent e778682 commit 364786a
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 36 deletions.
59 changes: 25 additions & 34 deletions boot/libs.ml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@ let local_libraries =
[ ("otherlibs/ordering", Some "Ordering", false, None)
; ("vendor/pp/src", Some "Pp", false, None)
; ("otherlibs/dyn", Some "Dyn", false, None)
; ("otherlibs/stdune/dune_filesystem_stubs",
Some "Dune_filesystem_stubs",
false,
None)
; ("otherlibs/stdune/dune_filesystem_stubs", Some "Dune_filesystem_stubs",
false, None)
; ("vendor/csexp/src", Some "Csexp", false, None)
; ("otherlibs/stdune/src", Some "Stdune", false, None)
; ("src/dune_graph", Some "Dune_graph", false, None)
Expand All @@ -25,10 +23,8 @@ let local_libraries =
; ("vendor/spawn/src", Some "Spawn", false, None)
; ("src/dune_stats", Some "Dune_stats", false, None)
; ("otherlibs/xdg", Some "Xdg", false, None)
; ("vendor/build_path_prefix_map/src",
Some "Build_path_prefix_map",
false,
None)
; ("vendor/build_path_prefix_map/src", Some "Build_path_prefix_map", false,
None)
; ("vendor/uutf", None, false, None)
; ("src/dune_sexp", Some "Dune_sexp", false, None)
; ("src/dune_util", Some "Dune_util", false, None)
Expand All @@ -39,18 +35,18 @@ let local_libraries =
; ("src/dune_targets", Some "Dune_targets", false, None)
; ("src/dune_cache", Some "Dune_cache", false, None)
; ("otherlibs/dune-rpc/private", Some "Dune_rpc_private", false, None)
; ("otherlibs/dune-action-plugin/src",
Some "Dune_action_plugin",
false,
None)
; ("src/dune_output_truncation", Some "Dune_output_truncation", false, None)
; ("otherlibs/dune-action-plugin/src", Some "Dune_action_plugin", false,
None)
; ("src/dune_output_truncation", Some "Dune_output_truncation", false,
None)
; ("src/csexp_rpc", Some "Csexp_rpc", false, None)
; ("src/dune_rpc_client", Some "Dune_rpc_client", false, None)
; ("src/dune_thread_pool", Some "Dune_thread_pool", false, None)
; ("otherlibs/ocamlc-loc/src", Some "Ocamlc_loc", false, None)
; ("src/fsevents", Some "Fsevents", false, None)
; ("vendor/ocaml-inotify/src", Some "Ocaml_inotify", false, None)
; ("src/async_inotify_for_dune", Some "Async_inotify_for_dune", false, None)
; ("src/async_inotify_for_dune", Some "Async_inotify_for_dune", false,
None)
; ("src/fswatch_win", Some "Fswatch_win", false, None)
; ("src/dune_file_watcher", Some "Dune_file_watcher", false, None)
; ("src/dune_engine", Some "Dune_engine", false, None)
Expand All @@ -65,28 +61,23 @@ let local_libraries =
; ("otherlibs/dune-private-libs/section", Some "Dune_section", false, None)
; ("src/dune_lang", Some "Dune_lang", false, None)
; ("src/fiber_event_bus", Some "Fiber_event_bus", false, None)
; ("otherlibs/dune-private-libs/meta_parser",
Some "Dune_meta_parser",
false,
None)
; ("otherlibs/dune-private-libs/meta_parser", Some "Dune_meta_parser",
false, None)
; ("src/fs", Some "Fs", false, None)
; ("src/dune_findlib", Some "Dune_findlib", false, None)
; ("src/dune_vcs", Some "Dune_vcs", false, None)
; ("vendor/opam/src/repository", None, false, None)
; ("vendor/opam/src/state", None, false, None)
; ("vendor/0install-solver/src/solver",
Some "Zeroinstall_solver",
false,
None)
; ("vendor/0install-solver/src/solver", Some "Zeroinstall_solver", false,
None)
; ("vendor/fmt/src", None, false, None)
; ("vendor/opam-0install/lib", Some "Opam_0install", false, None)
; ("otherlibs/dune-build-info/src",
Some "Build_info",
false,
Some "Build_info_data")
; ("otherlibs/dune-build-info/src", Some "Build_info", false,
Some "Build_info_data")
; ("src/dune_pkg", Some "Dune_pkg", false, None)
; ("src/install", Some "Install", false, None)
; ("otherlibs/dune-site/src/private", Some "Dune_site_private", false, None)
; ("otherlibs/dune-site/src/private", Some "Dune_site_private", false,
None)
; ("src/dune_threaded_console", Some "Dune_threaded_console", false, None)
; ("vendor/lwd/lwd", None, false, None)
; ("vendor/notty/src", None, true, None)
Expand All @@ -107,17 +98,17 @@ let local_libraries =

let build_flags =
[ ([ "win32"; "win64"; "mingw"; "mingw64" ],
[ "-ccopt"; "-D_UNICODE"; "-ccopt"; "-DUNICODE" ])
[ "-ccopt"; "-D_UNICODE"; "-ccopt"; "-DUNICODE" ])
]

let link_flags =
[ ([ "macosx" ],
[ "-cclib"
; "-framework CoreFoundation"
; "-cclib"
; "-framework CoreServices"
])
[ "-cclib"
; "-framework CoreFoundation"
; "-cclib"
; "-framework CoreServices"
])
; ([ "win32"; "win64"; "mingw"; "mingw64" ],
[ "-cclib"; "-lshell32"; "-cclib"; "-lole32"; "-cclib"; "-luuid" ])
[ "-cclib"; "-lshell32"; "-cclib"; "-lole32"; "-cclib"; "-luuid" ])
; ([ "beos" ], [ "-cclib"; "-lbsd" ])
]
2 changes: 2 additions & 0 deletions doc/changes/10883.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Fix an issue where C stubs would be rebuilt whenever the stderr of Dune was
redirected. (#10883, @nojb)
2 changes: 1 addition & 1 deletion otherlibs/stdune/src/format.mli
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
val pp_infinity : int
val pp_infinity : int [@@warning "-32"]

include module type of Stdlib.Format
2 changes: 1 addition & 1 deletion otherlibs/stdune/src/stdune.ml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[@@@alert unstable "The API of this library is not stable and may change without notice."]
(* [@@@alert unstable "The API of this library is not stable and may change without notice."] *)
[@@@alert "-unstable"]

module Appendable_list = Appendable_list
Expand Down

0 comments on commit 364786a

Please sign in to comment.