diff --git a/devtools/get_contracts/dune b/devtools/get_contracts/dune index 5e692d4f303febd5094b1122db1e7e30052dba1d..2a5fd812373de51de5f90b0cbe59ec4c7079eee2 100644 --- a/devtools/get_contracts/dune +++ b/devtools/get_contracts/dune @@ -26,6 +26,9 @@ tezos-micheline tezos-base get_contracts_lib) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_micheline diff --git a/devtools/yes_wallet/dune b/devtools/yes_wallet/dune index 96a34cd7cbc7816b9bde30c7ef360349675d075a..db7b4a43a22ddd5cd8994f4cf0dfd0e24b91382d 100644 --- a/devtools/yes_wallet/dune +++ b/devtools/yes_wallet/dune @@ -24,6 +24,9 @@ (name yes_wallet) (libraries yes_wallet_lib) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Yes_wallet_lib) diff --git a/docs/doc_gen/dune b/docs/doc_gen/dune index 34e0e7f52ab2c39eb3709f9b5bed05c926a69b55..8c6aa0a8377ead2675095def17adc0d889ec44f3 100644 --- a/docs/doc_gen/dune +++ b/docs/doc_gen/dune @@ -19,4 +19,5 @@ -open Tezos_shell -open Tezos_store -open Tezos_protocol_updater - -linkall))) + -linkall + (:include %{workspace_root}/macos-link-flags.sexp)))) diff --git a/docs/doc_gen/errors/dune b/docs/doc_gen/errors/dune index 26e26812abea7626371b4521121f243a09e1a8b6..aca73b55195e158aac0c8c77925dbe340e4bf733 100644 --- a/docs/doc_gen/errors/dune +++ b/docs/doc_gen/errors/dune @@ -8,4 +8,5 @@ -open Data_encoding -open Tezos_client_alpha -safe-string - -linkall))) + -linkall + (:include %{workspace_root}/macos-link-flags.sexp)))) diff --git a/dune b/dune index cc0b5a6a1635254759e6b97d590ad510746e1dde..720354e9e25d2be2c284db1a363a68f4aca80e38 100644 --- a/dune +++ b/dune @@ -13,3 +13,10 @@ (target static-link-flags.sexp) (action (with-stdout-to %{target} (system "[ '%{profile}' = 'static' ] && echo '(-ccopt -static -cclib -lusb-1.0 -cclib -ludev)' || echo '()'")))) + +; This file is included in the link_flags stanza of binaries and static libraries +; for which we should include -ccopt "-framework Security" on macOS. +(rule + (target macos-link-flags.sexp) + (action (with-stdout-to %{target} + (system "[ '%{system}' = 'macosx' ] && echo '(-ccopt \"-framework Security\")' || echo '()'")))) diff --git a/manifest/main.ml b/manifest/main.ml index 59449031b317a4296aba1ff3c2e09e33fb48afa3..3250c44e70d0c2a1870fe4220a4c0f16e43900e5 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -390,8 +390,9 @@ let tezt_core_lib = let tezt_js_lib = external_sublib tezt_lib ~js_compatible:true "tezt.js" let tezt ~opam ~path ?js_compatible ?modes ?(deps = []) ?dep_globs ?dep_files - ?opam_with_test ?synopsis l = + ?opam_with_test ?synopsis ?(with_macos_security_framework = false) l = tezt_without_tezt_lib_dependency + ~with_macos_security_framework ~opam ~path ?synopsis @@ -494,6 +495,7 @@ let _octez_stdlib_tests = "test_arrays"; ] ~path:"src/lib_stdlib/test" + ~with_macos_security_framework:true ~opam:"tezos-stdlib" ~modes:[Native; JS] ~deps: @@ -719,6 +721,7 @@ let _octez_hacl_gen0 = "gen0" ~path:"src/lib_hacl/gen/" ~opam:"tezos-hacl" + ~with_macos_security_framework:true ~bisect_ppx:false ~modules:["gen0"] ~deps:[compiler_libs_common] @@ -813,6 +816,7 @@ let _octez_error_monad_tests = tezt ["test_registration"; "test_splitted_error_encoding"] ~path:"src/lib_error_monad/test" + ~with_macos_security_framework:true ~opam:"tezos-error-monad" ~modes:[Native; JS] ~deps:[octez_error_monad |> open_; data_encoding; alcotezt] @@ -2055,6 +2059,7 @@ let _octez_sapling_tests = tests ["test_rustzcash"; "test_keys"; "test_merkle"; "test_roots"; "test_sapling"] ~path:"src/lib_sapling/test" + ~with_macos_security_framework:true ~opam:"tezos-sapling" ~dep_files:["vectors.csv"; "vectors-zip32.csv"] ~deps: @@ -2758,6 +2763,7 @@ let _octez_client_base_tests = ["bip39_tests"; "pbkdf_tests"] ~path:"src/lib_client_base/test" ~opam:"tezos-client-base" + ~with_macos_security_framework:true ~deps:[octez_base; octez_client_base |> open_; alcotest] ~js_compatible:true ~modes:[Native; JS] @@ -2805,6 +2811,7 @@ let _octez_signer_backends_tests = "test_encrypted" ~path:"src/lib_signer_backends/test" ~opam:"tezos-signer-backends" + ~with_macos_security_framework:true ~deps: [ octez_base; @@ -2851,6 +2858,7 @@ let _octez_signer_backends_unix_tests = "test_crouching" ~path:"src/lib_signer_backends/unix/test" ~opam:"tezos-signer-backends" + ~with_macos_security_framework:true ~deps: [ octez_error_monad |> open_; @@ -2967,6 +2975,7 @@ let _octez_mockup_tests = ["test_mockup_args"; "test_fuzzing_mockup_args"; "test_persistence"] ~path:"src/lib_mockup/test" ~opam:"tezos-mockup" + ~with_macos_security_framework:true ~deps: [ octez_base |> open_ ~m:"TzPervasives"; @@ -3055,6 +3064,7 @@ let _octez_proxy_tests = "test_fuzzing_light"; ] ~path:"src/lib_proxy/test" + ~with_macos_security_framework:true ~opam:"tezos-proxy" ~deps: [ @@ -3127,6 +3137,7 @@ let _octez_client_base_unix_tests = "test_mockup_wallet" ~path:"src/lib_client_base_unix/test" ~opam:"tezos-client-base-unix" + ~with_macos_security_framework:true ~deps: [ octez_base |> open_ ~m:"TzPervasives"; @@ -3367,6 +3378,7 @@ let _octez_dal_node_lib_tests = ["test_lib_dal_node"] ~path:"src/lib_dal_node/test" ~opam:"tezos-dal-node-lib" + ~with_macos_security_framework:true ~deps: [ octez_stdlib |> open_; @@ -3402,6 +3414,7 @@ let _octez_dac_node_lib_tests = ~path:"src/lib_dac_node/test" ~opam:"tezos-dac-node-lib-test" ~synopsis:"Test for dac node lib" + ~with_macos_security_framework:true ~deps: [ octez_stdlib |> open_; @@ -3840,6 +3853,7 @@ end = struct test "main" ~path:(path // "lib_protocol/test/integration/consensus") + ~with_macos_security_framework:true ~opam:(sf "tezos-protocol-%s-tests" name_dash) ~deps: [ @@ -3858,6 +3872,7 @@ end = struct "main" ~path:(path // "lib_protocol/test/integration/gas") ~opam:(sf "tezos-protocol-%s-tests" name_dash) + ~with_macos_security_framework:true ~deps: [ alcotest_lwt; @@ -3873,6 +3888,7 @@ end = struct "main" ~path:(path // "lib_protocol/test/integration/michelson") ~opam:(sf "tezos-protocol-%s-tests" name_dash) + ~with_macos_security_framework:true ~dep_globs: (conditional_list [ @@ -3908,6 +3924,7 @@ end = struct "main" ~path:(path // "lib_protocol/test/integration/operations") ~opam:(sf "tezos-protocol-%s-tests" name_dash) + ~with_macos_security_framework:true ~dep_globs:(conditional_list [("contracts/*", N.(number >= 013))]) ~deps: [ @@ -3927,6 +3944,7 @@ end = struct "main" ~path:(path // "lib_protocol/test/integration/validate") ~opam:(sf "tezos-protocol-%s-tests" name_dash) + ~with_macos_security_framework:true ~deps: [ alcotest_lwt; @@ -3946,6 +3964,7 @@ end = struct "main" ~path:(path // "lib_protocol/test/integration") ~opam:(sf "tezos-protocol-%s-tests" name_dash) + ~with_macos_security_framework:true ~deps: [ (if N.(number >= 015) then Some tezt_lib else None) |> if_some; @@ -4006,6 +4025,7 @@ end = struct ~synopsis:"Tezos/Protocol: tests for economic-protocol definition" ~path:(path // "lib_protocol/test/pbt") ~opam:(sf "tezos-protocol-%s-tests" name_dash) + ~with_macos_security_framework:true ~deps: [ octez_base @@ -4038,6 +4058,7 @@ end = struct ~path:(path // "lib_protocol/test/unit") ~opam:(sf "tezos-protocol-%s-tests" name_dash) ~alias:"" + ~with_macos_security_framework:true ~deps: [ octez_base |> open_ ~m:"TzPervasives" @@ -4083,6 +4104,7 @@ end = struct tezt ["test_logging"] ~path:(path // "lib_protocol/test/regression") + ~with_macos_security_framework:true ~opam:(sf "tezos-protocol-%s-tests" name_dash) ~deps: [ @@ -4518,6 +4540,7 @@ module Protocol = Protocol ] ~modules:["gen"] ~linkall:true + ~with_macos_security_framework:true ~dune: Dune.( let gen_json name = @@ -4647,6 +4670,7 @@ module Protocol = Protocol "test_conflict_handler"; ] ~path:(path // "lib_plugin/test") + ~with_macos_security_framework:true ~synopsis:"Tezos/Protocol: protocol plugin tests" ~opam:(sf "tezos-protocol-plugin-%s-tests" name_dash) ~deps: @@ -4677,6 +4701,7 @@ module Protocol = Protocol ] ~path:(path // "lib_client/test") ~opam:(sf "tezos-client-%s" name_dash) + ~with_macos_security_framework:true ~deps: [ octez_base |> open_ ~m:"TzPervasives" @@ -4843,6 +4868,7 @@ module Protocol = Protocol "tenderbrute_main" ~alias:"" ~path:(path // "lib_delegate/test/tenderbrute") + ~with_macos_security_framework:true ~opam:(sf "tezos-baking-%s" name_dash) ~deps: [ @@ -4886,6 +4912,7 @@ module Protocol = Protocol test "main" ~path:(path // "lib_delegate/test") + ~with_macos_security_framework:true ~opam:(sf "tezos-baking-%s" name_dash) ~deps: [ @@ -4968,6 +4995,7 @@ module Protocol = Protocol ~path:(path // sf "bin_%s" daemon) ~synopsis:(sf "Tezos/Protocol: %s binary" daemon) ~release_status:executable_release_status + ~with_macos_security_framework:true ~deps: [ octez_base |> open_ ~m:"TzPervasives" @@ -5113,6 +5141,7 @@ module Protocol = Protocol ~path:(path // "bin_sc_rollup_client") ~synopsis:"Tezos/Protocol: Smart rollup client" ~release_status:executable_release_status + ~with_macos_security_framework:true ~deps: [ octez_base |> open_ ~m:"TzPervasives" @@ -5130,6 +5159,7 @@ module Protocol = Protocol ~path:(path // "bin_sc_rollup_node") ~synopsis:"Tezos/Protocol: protocol specific Smart rollup node" ~release_status:executable_release_status + ~with_macos_security_framework:true ~deps: [ octez_base |> open_ |> open_ ~m:"TzPervasives" @@ -5188,6 +5218,7 @@ module Protocol = Protocol ~path:(path // "bin_tx_rollup_client") ~synopsis:"Tezos/Protocol: `octez-tx-rollup-client-alpha` client binary" ~release_status:executable_release_status + ~with_macos_security_framework:true ~deps: [ octez_base |> open_ ~m:"TzPervasives" @@ -5210,6 +5241,7 @@ module Protocol = Protocol ~path:(path // "bin_tx_rollup_node") ~synopsis:"Tezos/Protocol: Transaction Rollup node binary" ~release_status:executable_release_status + ~with_macos_security_framework:true ~deps: [ octez_base |> open_ ~m:"TzPervasives" @@ -5253,6 +5285,7 @@ module Protocol = Protocol "main" ~path:(path // "lib_dal/test") ~opam:(sf "tezos-dal-%s" name_dash) + ~with_macos_security_framework:true ~deps: [ octez_base |> open_ ~m:"TzPervasives" @@ -5295,6 +5328,7 @@ module Protocol = Protocol test "main" ~path:(path // "lib_dac/test") + ~with_macos_security_framework:true ~opam:(sf "tezos-dac-%s" name_dash) ~deps: [ @@ -5331,6 +5365,7 @@ module Protocol = Protocol ["test_uf"; "test_inference"] ~path:(path // "lib_benchmark/lib_benchmark_type_inference/test") ~opam:(sf "tezos-benchmark-type-inference-%s" name_dash) + ~with_macos_security_framework:true ~deps: [ octez_micheline |> open_; @@ -5385,6 +5420,7 @@ module Protocol = Protocol "test_distribution"; ] ~path:(path // "lib_benchmark/test") + ~with_macos_security_framework:true ~opam:(sf "tezos-benchmark-%s" name_dash) ~deps: [ @@ -5542,6 +5578,7 @@ let _octez_micheline_rewriting_tests = test "test_rewriting" ~path:"src/lib_benchmark/lib_micheline_rewriting/test" + ~with_macos_security_framework:true ~opam:"tezos-micheline-rewriting" ~deps: [ @@ -5566,6 +5603,7 @@ let _octez_store_tests = "test_testchain"; ] ~path:"src/lib_store/unix/test" + ~with_macos_security_framework:true ~opam:"tezos-store" ~deps: [ @@ -5649,6 +5687,7 @@ let _octez_shell_tests = "test_peer_validator"; ] ~path:"src/lib_shell/test" + ~with_macos_security_framework:true ~opam:"tezos-shell" ~deps: [ @@ -5764,6 +5803,7 @@ let _get_contracts = private_exe "get_contracts" ~path:("devtools" // "get_contracts") + ~with_macos_security_framework:true ~synopsis:"A script to extract smart contracts from a node." ~opam:"" ~deps: @@ -5828,6 +5868,7 @@ let _yes_wallet = private_exe "yes_wallet" ~path:("devtools" // "yes_wallet") + ~with_macos_security_framework:true ~synopsis: "A script extracting delegates' keys from a context into a wallet." ~opam:"" @@ -5897,6 +5938,7 @@ let _octez_node = ~internal_name:"main" ~synopsis:"Tezos: `octez-node` binary" ~release_status:Released + ~with_macos_security_framework:true ~deps: ([ octez_base |> open_ ~m:"TzPervasives" |> open_; @@ -5985,6 +6027,7 @@ let _octez_client = ] @ protocol_deps) ~linkall:true + ~with_macos_security_framework:true ~dune: Dune. [ @@ -6016,6 +6059,7 @@ let _octez_codec = ~internal_name:"codec" ~synopsis:"Tezos: `octez-codec` binary to encode and decode values" ~release_status:Released + ~with_macos_security_framework:true ~deps: ([ data_encoding |> open_; @@ -6048,6 +6092,7 @@ let _octez_proxy_server = ~internal_name:"main_proxy_server" ~synopsis:"Octez: `octez-proxy-server` binary" ~release_status:Released + ~with_macos_security_framework:true ~deps: ([ octez_base |> open_ ~m:"TzPervasives" |> open_; @@ -6075,6 +6120,7 @@ let _octez_snoop = ~path:"src/bin_snoop" ~internal_name:"main_snoop" ~synopsis:"Tezos: `octez-snoop` binary" + ~with_macos_security_framework:true ~deps: [ octez_base |> open_ ~m:"TzPervasives"; @@ -6135,6 +6181,7 @@ let _octez_signer = ~internal_name:"main_signer" ~synopsis:"Tezos: `octez-signer` binary" ~release_status:Released + ~with_macos_security_framework:true ~deps: [ octez_base |> open_ ~m:"TzPervasives"; @@ -6165,6 +6212,7 @@ let _octez_tps_evaluation = ~internal_name:"main_tps_evaluation" ~path:"src/bin_tps_evaluation" ~synopsis:"Tezos TPS evaluation tool" + ~with_macos_security_framework:true ~deps: [ octez_base |> open_ ~m:"TzPervasives"; @@ -6231,6 +6279,7 @@ let _octez_dal_node = ~internal_name:"main_dal" ~synopsis:"Tezos: `octez-dal-node` binary" ~release_status:Experimental + ~with_macos_security_framework:true ~deps: ([ octez_base |> open_ ~m:"TzPervasives"; @@ -6283,6 +6332,7 @@ let _octez_dac_node = ~internal_name:"main_dac" ~synopsis:"Tezos: `octez-dac-node` binary" ~release_status:Experimental + ~with_macos_security_framework:true ~deps: ([ octez_base |> open_ ~m:"TzPervasives"; @@ -6313,6 +6363,7 @@ let _octez_scoru_wasm_debugger = ~opam:"octez-smart-rollup-wasm-debugger" ~synopsis:"Tezos: Debugger for the smart rollups’ WASM kernels" ~release_status:Released + ~with_macos_security_framework:true ~deps: [ octez_base |> open_ ~m:"TzPervasives"; @@ -6419,7 +6470,13 @@ let () = Protocol.(main alpha); ] in - test "main" ~alias:"" ~path:"tezt/tests" ~opam:"" ~deps:(deps @ test_libs) + test + "main" + ~with_macos_security_framework:true + ~alias:"" + ~path:"tezt/tests" + ~opam:"" + ~deps:(deps @ test_libs) in generate ~make_tezt_exe diff --git a/manifest/manifest.ml b/manifest/manifest.ml index b8ff8c90f305c63c819f1214caddc297464ea0f2..70979abc52e0bb5b737ec841edc516c3449044da 100644 --- a/manifest/manifest.ml +++ b/manifest/manifest.ml @@ -1045,6 +1045,7 @@ module Target = struct license : string option; extra_authors : string list; ctypes : Ctypes.t option; + with_macos_security_framework : bool; } and preprocessor = PPS of t * string list | Staged_PPS of t list @@ -1227,6 +1228,7 @@ module Target = struct ?cram:bool -> ?license:string -> ?extra_authors:string list -> + ?with_macos_security_framework:bool -> path:string -> 'a -> t option @@ -1276,7 +1278,8 @@ module Target = struct ?profile ?(opam_only_deps = []) ?(release_status = Auto_opam) ?static ?synopsis ?description ?(time_measurement_ppx = false) ?(virtual_modules = []) ?default_implementation ?(cram = false) ?license - ?(extra_authors = []) ~path names = + ?(extra_authors = []) ?(with_macos_security_framework = false) ~path names + = let conflicts = List.filter_map Fun.id conflicts in let deps = List.filter_map Fun.id deps in let opam_only_deps = List.filter_map Fun.id opam_only_deps in @@ -1592,6 +1595,7 @@ module Target = struct license; extra_authors; ctypes; + with_macos_security_framework; } let public_lib ?internal_name = @@ -1788,13 +1792,14 @@ type tezt_target = { modes : Dune.mode list option; synopsis : string option; opam_with_test : with_test option; + with_macos_security_framework : bool; } let tezt_targets_by_path : tezt_target String_map.t ref = ref String_map.empty let tezt ~opam ~path ?js_compatible ?modes ?(lib_deps = []) ?(exe_deps = []) ?(js_deps = []) ?(dep_globs = []) ?(dep_files = []) ?synopsis - ?opam_with_test modules = + ?opam_with_test ?(with_macos_security_framework = false) modules = if String_map.mem path !tezt_targets_by_path then invalid_arg ("cannot call Manifest.tezt twice for the same directory: " ^ path) ; @@ -1811,6 +1816,7 @@ let tezt ~opam ~path ?js_compatible ?modes ?(lib_deps = []) ?(exe_deps = []) modes; synopsis; opam_with_test; + with_macos_security_framework; } in tezt_targets_by_path := String_map.add path tezt_target !tezt_targets_by_path @@ -1830,6 +1836,7 @@ let register_tezt_targets ~make_tezt_exe = modes; synopsis; opam_with_test; + with_macos_security_framework; } = let path_with_underscores = String.map (function '-' | '/' -> '_' | c -> c) path @@ -1853,6 +1860,7 @@ let register_tezt_targets ~make_tezt_exe = exe_name ~alias:"runtezt" ~path + ~with_macos_security_framework ~opam ?synopsis ?js_compatible @@ -2005,16 +2013,20 @@ let generate_dune (internal : Target.internal) = in let link_flags = let linkall = internal.linkall && not is_lib in - let static = + let static_flags = if internal.static then - Some Dune.[S ":include"; S "%{workspace_root}/static-link-flags.sexp"] - else None + [Dune.[S ":include"; S "%{workspace_root}/static-link-flags.sexp"]] + else [] in - match (linkall, static) with - | false, None -> None - | true, None -> Some [Dune.[S ":standard"; S "-linkall"]] - | false, Some static -> Some [[S ":standard"]; static] - | true, Some static -> Some [[S ":standard"; S "-linkall"]; static] + let macos_link_flags = + if internal.with_macos_security_framework then + [Dune.[S ":include"; S "%{workspace_root}/macos-link-flags.sexp"]] + else [] + in + let linkall_flags = if linkall then [Dune.[S "-linkall"]] else [] in + List.concat [static_flags; macos_link_flags; linkall_flags] |> function + | [] -> None + | link_flags -> Some (Dune.[S ":standard"] :: link_flags) in let open_flags : Dune.s_expr list = internal.opens |> List.map (fun m -> Dune.(H [S "-open"; S m])) diff --git a/manifest/manifest.mli b/manifest/manifest.mli index 83cee60178c6b9553772cfa5189ec8c1c1004d9c..19f10e349dee3175b54e8ed7c3bd24533f4d8bc9 100644 --- a/manifest/manifest.mli +++ b/manifest/manifest.mli @@ -733,7 +733,11 @@ type release_status = Unreleased | Experimental | Released | Auto_opam - [extra_authors]: list of authors in addition to the Tezos Dev Team. - - [path]: the path to the directory of the [dune] file that will define this target. *) + - [path]: the path to the directory of the [dune] file that will define this target. + + - [with_macos_security_framework]: Default value is [false]. When set to + [true], the [-ccopt "-framework Security"]flag is added at link time for + macOS system. *) type 'a maker = ?all_modules_except:string list -> ?bisect_ppx:bool -> @@ -776,6 +780,7 @@ type 'a maker = ?cram:bool -> ?license:string -> ?extra_authors:string list -> + ?with_macos_security_framework:bool -> path:string -> 'a -> target @@ -910,7 +915,11 @@ val tests : Additionally, the library [PACKAGE_tezt_lib] is also linked in [tezt/tests/main.exe] so that this executable can be used to run all tests with auto-balancing - and other Tezt features. *) + and other Tezt features. + + The flag [with_macos_security_framework] has a default [false]. When set to + [true], the [-ccopt "-framework Security"]flag is added at link time for + macOS system. *) val tezt : opam:string -> path:string -> @@ -923,6 +932,7 @@ val tezt : ?dep_files:string list -> ?synopsis:string -> ?opam_with_test:with_test -> + ?with_macos_security_framework:bool -> string list -> unit diff --git a/src/bin_client/dune b/src/bin_client/dune index eb84159673cedb9c7cc353dc5be875ea7b4e1e6a..5e5292facebd02f9551d554850ba31ce966d0d2b 100644 --- a/src/bin_client/dune +++ b/src/bin_client/dune @@ -111,8 +111,10 @@ (tezos-protocol-plugin-alpha -> void_for_linking-tezos-protocol-plugin-alpha.empty) (-> void_for_linking-tezos-protocol-plugin-alpha.empty))) (link_flags - (:standard -linkall) - (:include %{workspace_root}/static-link-flags.sexp)) + (:standard) + (:include %{workspace_root}/static-link-flags.sexp) + (:include %{workspace_root}/macos-link-flags.sexp) + (-linkall)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/bin_codec/dune b/src/bin_codec/dune index d974cd3ebe90fa77bdf8c3b274a72c7c01023981..595b558ab5e7ca48b4d834f6c337d4d1cebec6b4 100644 --- a/src/bin_codec/dune +++ b/src/bin_codec/dune @@ -56,8 +56,10 @@ (tezos-client-alpha -> void_for_linking-tezos-client-alpha.empty) (-> void_for_linking-tezos-client-alpha.empty))) (link_flags - (:standard -linkall) - (:include %{workspace_root}/static-link-flags.sexp)) + (:standard) + (:include %{workspace_root}/static-link-flags.sexp) + (:include %{workspace_root}/macos-link-flags.sexp) + (-linkall)) (flags (:standard) -open Data_encoding diff --git a/src/bin_dac_node/dune b/src/bin_dac_node/dune index d0b40145ee2bfd2c7defcbc484ba7b859aa1459d..929f906f7a4b9cd43a9142600a912dff0da5ea76 100644 --- a/src/bin_dac_node/dune +++ b/src/bin_dac_node/dune @@ -29,7 +29,8 @@ (-> void_for_linking-tezos-dac-alpha.empty))) (link_flags (:standard) - (:include %{workspace_root}/static-link-flags.sexp)) + (:include %{workspace_root}/static-link-flags.sexp) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/bin_dal_node/dune b/src/bin_dal_node/dune index e27a803799ea4fc198edc3fe7aa0aa9b5eb20267..574e3fca90fd29d6761bdb8d71d49190abc546b4 100644 --- a/src/bin_dal_node/dune +++ b/src/bin_dal_node/dune @@ -32,7 +32,8 @@ (-> void_for_linking-tezos-dal-alpha.empty))) (link_flags (:standard) - (:include %{workspace_root}/static-link-flags.sexp)) + (:include %{workspace_root}/static-link-flags.sexp) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/bin_node/dune b/src/bin_node/dune index c4f17348c44640a44c766aae3fbb326284e135b7..8d1b26306d678622d661ce46fd5ecee516ffaf1f 100644 --- a/src/bin_node/dune +++ b/src/bin_node/dune @@ -125,8 +125,10 @@ (tezos-protocol-plugin-alpha-registerer -> void_for_linking-tezos-protocol-plugin-alpha-registerer.empty) (-> void_for_linking-tezos-protocol-plugin-alpha-registerer.empty))) (link_flags - (:standard -linkall) - (:include %{workspace_root}/static-link-flags.sexp)) + (:standard) + (:include %{workspace_root}/static-link-flags.sexp) + (:include %{workspace_root}/macos-link-flags.sexp) + (-linkall)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/bin_proxy_server/dune b/src/bin_proxy_server/dune index bcf14c15d6f640b7b1c8b1cd7e804a81a6b03522..af38fab7c2ceb8a9b80399a90f2024c123c6e32a 100644 --- a/src/bin_proxy_server/dune +++ b/src/bin_proxy_server/dune @@ -116,8 +116,10 @@ (tezos-protocol-plugin-alpha -> void_for_linking-tezos-protocol-plugin-alpha.empty) (-> void_for_linking-tezos-protocol-plugin-alpha.empty))) (link_flags - (:standard -linkall) - (:include %{workspace_root}/static-link-flags.sexp)) + (:standard) + (:include %{workspace_root}/static-link-flags.sexp) + (:include %{workspace_root}/macos-link-flags.sexp) + (-linkall)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/bin_signer/dune b/src/bin_signer/dune index 3f25945c6afc7e3d299a34188420a5e589e3a36e..74014166bbe70e743e9d18023fa27b2715c09d2a 100644 --- a/src/bin_signer/dune +++ b/src/bin_signer/dune @@ -22,7 +22,8 @@ tezos-signer-backends.unix) (link_flags (:standard) - (:include %{workspace_root}/static-link-flags.sexp)) + (:include %{workspace_root}/static-link-flags.sexp) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/bin_snoop/dune b/src/bin_snoop/dune index 35b64bfc1339c26fc3424aa23910a080ac1121cf..d8e68c3bac3630980e79c4db22fd59c1f093b3a7 100644 --- a/src/bin_snoop/dune +++ b/src/bin_snoop/dune @@ -20,8 +20,10 @@ pyml prbnmcn-stats) (link_flags - (:standard -linkall) - (:include %{workspace_root}/static-link-flags.sexp)) + (:standard) + (:include %{workspace_root}/static-link-flags.sexp) + (:include %{workspace_root}/macos-link-flags.sexp) + (-linkall)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/bin_tps_evaluation/dune b/src/bin_tps_evaluation/dune index 0493317c01a833f3ff890d7d0767379fb21d27b9..f5ea621ab3527fbeec1b51fe1d745801fe6db61b 100644 --- a/src/bin_tps_evaluation/dune +++ b/src/bin_tps_evaluation/dune @@ -21,6 +21,9 @@ tezt-tezos tezt-performance-regression uri) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/bin_wasm_debugger/dune b/src/bin_wasm_debugger/dune index e9c4cde46b1121fb5b6e82e9696397b7b83f9466..9e07308ead4528e09901cef886f6589cc63fcfb5 100644 --- a/src/bin_wasm_debugger/dune +++ b/src/bin_wasm_debugger/dune @@ -19,7 +19,8 @@ tezos-webassembly-interpreter-extra) (link_flags (:standard) - (:include %{workspace_root}/static-link-flags.sexp)) + (:include %{workspace_root}/static-link-flags.sexp) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/lib_benchmark/lib_micheline_rewriting/test/dune b/src/lib_benchmark/lib_micheline_rewriting/test/dune index 135a05a95c9705de5d211f2d0746a89a184b55c8..560949a46a41b7ade47e561a987fe3e38e747b1d 100644 --- a/src/lib_benchmark/lib_micheline_rewriting/test/dune +++ b/src/lib_benchmark/lib_micheline_rewriting/test/dune @@ -10,6 +10,9 @@ tezos-error-monad tezos-client-alpha alcotest-lwt) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_micheline)) diff --git a/src/lib_client_base/test/dune b/src/lib_client_base/test/dune index fb8dfdfb7e0d89d064c8fa6902073e505746651b..3a85ca3c6e5b44d0001f4315f5c93a97fbd880a5 100644 --- a/src/lib_client_base/test/dune +++ b/src/lib_client_base/test/dune @@ -11,6 +11,9 @@ tezos-client-base alcotest) (js_of_ocaml) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_client_base)) diff --git a/src/lib_client_base_unix/test/dune b/src/lib_client_base_unix/test/dune index 1f50e8e220269dc2184719b74bc31a830202ffb6..1e753f34f67e732e5112e10b8ae28212cdfedecb 100644 --- a/src/lib_client_base_unix/test/dune +++ b/src/lib_client_base_unix/test/dune @@ -10,6 +10,9 @@ tezos-base-test-helpers alcotest alcotest-lwt) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/lib_dac_node/test/dune b/src/lib_dac_node/test/dune index 1205238ef9a21a3ccafb614ae265c03a33e1ba13..2c03c2b08ec9fdc2661270eb87f1afc9babdb05b 100644 --- a/src/lib_dac_node/test/dune +++ b/src/lib_dac_node/test/dune @@ -11,6 +11,9 @@ tezos-base-test-helpers tezos_dac_node_lib alcotest-lwt) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_stdlib diff --git a/src/lib_dal_node/test/dune b/src/lib_dal_node/test/dune index 151a18c0f912ed017be8a17cf3bd54042de2eea3..397ba498cd58863bdb7292c98536dded4164b20d 100644 --- a/src/lib_dal_node/test/dune +++ b/src/lib_dal_node/test/dune @@ -12,6 +12,9 @@ tezos-crypto-dal tezos_dal_node_lib alcotest-lwt) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_stdlib diff --git a/src/lib_error_monad/test/dune b/src/lib_error_monad/test/dune index 384c1c1638e758bc4eaa399d970f17e7af59f89e..7d2366d55372d082834626b97244eb1615e7df4e 100644 --- a/src/lib_error_monad/test/dune +++ b/src/lib_error_monad/test/dune @@ -25,6 +25,9 @@ (libraries src_lib_error_monad_test_tezt_lib tezt) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (modules main)) (rule @@ -43,6 +46,9 @@ src_lib_error_monad_test_tezt_lib tezt.js) (js_of_ocaml) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (modules main_js)) (rule diff --git a/src/lib_hacl/gen/dune b/src/lib_hacl/gen/dune index ecdf75560a84ccbf9ff435180523496b459d9de0..20b71609231a0892ab1af47825d48e5933814c82 100644 --- a/src/lib_hacl/gen/dune +++ b/src/lib_hacl/gen/dune @@ -5,6 +5,9 @@ (name gen0) (libraries compiler-libs.common) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (modules gen0)) (executable diff --git a/src/lib_mockup/test/dune b/src/lib_mockup/test/dune index 94cc36ed3b1de3393b339e6afc572fd83b1dffe3..1f38f01fe792b223b911920affb28dbc529d7132 100644 --- a/src/lib_mockup/test/dune +++ b/src/lib_mockup/test/dune @@ -31,6 +31,9 @@ (libraries src_lib_mockup_test_tezt_lib tezt) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (modules main)) (rule (alias runtezt) (package tezos-mockup) (action (run %{dep:./main.exe}))) diff --git a/src/lib_p2p/test/dune b/src/lib_p2p/test/dune index 18ac112ca60def812a0f6028554504c91fedc53c..2cf1ea3609572c33feb51278ef1e5d6047de236d 100644 --- a/src/lib_p2p/test/dune +++ b/src/lib_p2p/test/dune @@ -27,7 +27,8 @@ alcotest-lwt astring) (link_flags - (:standard -linkall)) + (:standard) + (-linkall)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/lib_protocol_compiler/bin/dune b/src/lib_protocol_compiler/bin/dune index bbc16b330135b36313fde48796fbad3e34b2c5d5..82d225be91905a85cd1644ba0141d8c7bcd088f7 100644 --- a/src/lib_protocol_compiler/bin/dune +++ b/src/lib_protocol_compiler/bin/dune @@ -17,8 +17,9 @@ (libraries octez-protocol-compiler.native) (link_flags - (:standard -linkall) - (:include %{workspace_root}/static-link-flags.sexp)) + (:standard) + (:include %{workspace_root}/static-link-flags.sexp) + (-linkall)) (modules Main_native)) (executable @@ -51,8 +52,9 @@ tezos-base.unix tezos-stdlib-unix) (link_flags - (:standard -linkall) - (:include %{workspace_root}/static-link-flags.sexp)) + (:standard) + (:include %{workspace_root}/static-link-flags.sexp) + (-linkall)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/lib_proxy/test/dune b/src/lib_proxy/test/dune index 17c97ef2ac5030a0d9f09f58b86e265c275491e8..124fbe6f55edced52d7f32fb743cf8a151a0cf3a 100644 --- a/src/lib_proxy/test/dune +++ b/src/lib_proxy/test/dune @@ -14,6 +14,9 @@ qcheck-alcotest alcotest-lwt uri) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/lib_sapling/test/dune b/src/lib_sapling/test/dune index cbda583e54d6a934a45259563b93256aefbb355e..660c750941556025d0658782ccc162d30cc12214 100644 --- a/src/lib_sapling/test/dune +++ b/src/lib_sapling/test/dune @@ -16,6 +16,9 @@ data-encoding tezos-base-test-helpers alcotest-lwt) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_sapling @@ -62,7 +65,8 @@ tezos-hacl) (js_of_ocaml) (link_flags - (:standard -linkall)) + (:standard) + (-linkall)) (modules test_js)) (rule diff --git a/src/lib_shell/test/dune b/src/lib_shell/test/dune index 6bf2e9f5f9cdfacc1494a3b61c94c7bf83afd3b8..e6b64d56587c41e7994eb5edc20ee2f1c18a2e7d 100644 --- a/src/lib_shell/test/dune +++ b/src/lib_shell/test/dune @@ -31,6 +31,9 @@ tezos-event-logging-test-helpers tezos-test-helpers alcotest-lwt) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/lib_signer_backends/test/dune b/src/lib_signer_backends/test/dune index 87c7885348c9c98121f0660bc3344fc4fb5f1d23..d0496d1629d530ec6f93f8e9958944b73e78db6f 100644 --- a/src/lib_signer_backends/test/dune +++ b/src/lib_signer_backends/test/dune @@ -13,6 +13,9 @@ tezos-signer-backends alcotest-lwt uri) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_stdlib diff --git a/src/lib_signer_backends/unix/test/dune b/src/lib_signer_backends/unix/test/dune index 57e58af23ed9879c4c355e4ff22e2a1b1b7bfa7b..c5a8b13de2ffcbd67aa7d62c7061c11ea76a12b9 100644 --- a/src/lib_signer_backends/unix/test/dune +++ b/src/lib_signer_backends/unix/test/dune @@ -10,6 +10,9 @@ tezos-client-base tezos-signer-backends.unix alcotest-lwt) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_error_monad diff --git a/src/lib_stdlib/test/dune b/src/lib_stdlib/test/dune index fb6ca69fe289c94c612408cf797f479abd7c4ee2..71eddb64e67e60951cb75f87b5d4ab5d7eb089dd 100644 --- a/src/lib_stdlib/test/dune +++ b/src/lib_stdlib/test/dune @@ -37,6 +37,9 @@ (libraries src_lib_stdlib_test_tezt_lib tezt) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (modules main)) (rule (alias runtezt) (package tezos-stdlib) (action (run %{dep:./main.exe}))) @@ -52,6 +55,9 @@ src_lib_stdlib_test_tezt_lib tezt.js) (js_of_ocaml) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (modules main_js)) (rule diff --git a/src/lib_store/unix/test/dune b/src/lib_store/unix/test/dune index ba2a513562b0b45365300421c5b2c014e6cb91fd..86954a3911562cae353453af98345a881cf50d7b 100644 --- a/src/lib_store/unix/test/dune +++ b/src/lib_store/unix/test/dune @@ -31,6 +31,9 @@ alcotest-lwt tezos-test-helpers tezos-test-helpers-extra) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_011_PtHangz2/lib_client/test/dune b/src/proto_011_PtHangz2/lib_client/test/dune index aaa81df72f21270162d288dc7a7b099d7dafa638..14d37101048b907d2c505ed548e41675c6f37186 100644 --- a/src/proto_011_PtHangz2/lib_client/test/dune +++ b/src/proto_011_PtHangz2/lib_client/test/dune @@ -16,6 +16,9 @@ tezos-test-helpers alcotest-lwt qcheck-alcotest) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_011_PtHangz2/lib_parameters/dune b/src/proto_011_PtHangz2/lib_parameters/dune index 39df9f62b2a5b8e930a3999ba9369d37f8c35a7b..1fd3d4da27ec9bd70ac372ec1209c43f8f75c73f 100644 --- a/src/proto_011_PtHangz2/lib_parameters/dune +++ b/src/proto_011_PtHangz2/lib_parameters/dune @@ -22,7 +22,9 @@ tezos-base tezos-protocol-011-PtHangz2.parameters) (link_flags - (:standard -linkall)) + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp) + (-linkall)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_012_Psithaca/lib_client/test/dune b/src/proto_012_Psithaca/lib_client/test/dune index ce61f2908acaa95395cb1a2c7f08460f25dcce83..0f8aaa93fdb69ecc68fb6e0b4f3bf58529b5f291 100644 --- a/src/proto_012_Psithaca/lib_client/test/dune +++ b/src/proto_012_Psithaca/lib_client/test/dune @@ -16,6 +16,9 @@ tezos-test-helpers alcotest-lwt qcheck-alcotest) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_012_Psithaca/lib_parameters/dune b/src/proto_012_Psithaca/lib_parameters/dune index 732a223c033d77729da4053d30da5ea551f22ba9..ed7923c17602416e131ffca330d5f1c5392f18c0 100644 --- a/src/proto_012_Psithaca/lib_parameters/dune +++ b/src/proto_012_Psithaca/lib_parameters/dune @@ -23,7 +23,9 @@ tezos-protocol-012-Psithaca.parameters tezos-protocol-012-Psithaca) (link_flags - (:standard -linkall)) + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp) + (-linkall)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_013_PtJakart/lib_client/test/dune b/src/proto_013_PtJakart/lib_client/test/dune index 0456cb21a63e806e9e76ce712e89f19e7cdc434e..85d3a23a8b4ba43fde7df923dabbb4c1f5e051b3 100644 --- a/src/proto_013_PtJakart/lib_client/test/dune +++ b/src/proto_013_PtJakart/lib_client/test/dune @@ -16,6 +16,9 @@ tezos-test-helpers alcotest-lwt qcheck-alcotest) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_013_PtJakart/lib_parameters/dune b/src/proto_013_PtJakart/lib_parameters/dune index 7836339820f84ef3c5eb3755c7af69210871f979..77bab634c5f88decc742f0301059a42da1e57462 100644 --- a/src/proto_013_PtJakart/lib_parameters/dune +++ b/src/proto_013_PtJakart/lib_parameters/dune @@ -23,7 +23,9 @@ tezos-protocol-013-PtJakart.parameters tezos-protocol-013-PtJakart) (link_flags - (:standard -linkall)) + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp) + (-linkall)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_014_PtKathma/lib_client/test/dune b/src/proto_014_PtKathma/lib_client/test/dune index 82bc8648e3b7d902a3ffbd59b626d09503daaac2..2c21737c2827f16b7ac8b73c9a0d81609113b6f8 100644 --- a/src/proto_014_PtKathma/lib_client/test/dune +++ b/src/proto_014_PtKathma/lib_client/test/dune @@ -16,6 +16,9 @@ tezos-test-helpers alcotest-lwt qcheck-alcotest) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_014_PtKathma/lib_parameters/dune b/src/proto_014_PtKathma/lib_parameters/dune index 68ada79d8d4e35f36fa8e633d87e63d54ba9692a..d57c5b30672c38ea450f78928af274d37cc78b0e 100644 --- a/src/proto_014_PtKathma/lib_parameters/dune +++ b/src/proto_014_PtKathma/lib_parameters/dune @@ -23,7 +23,9 @@ tezos-protocol-014-PtKathma.parameters tezos-protocol-014-PtKathma) (link_flags - (:standard -linkall)) + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp) + (-linkall)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_015_PtLimaPt/bin_accuser/dune b/src/proto_015_PtLimaPt/bin_accuser/dune index 42c36f538c1ba6562790db9f80835dcfb437111d..470b1da3b6cd0f8422d2b540f133180e0943d945 100644 --- a/src/proto_015_PtLimaPt/bin_accuser/dune +++ b/src/proto_015_PtLimaPt/bin_accuser/dune @@ -17,7 +17,8 @@ tezos-client-base-unix) (link_flags (:standard) - (:include %{workspace_root}/static-link-flags.sexp)) + (:include %{workspace_root}/static-link-flags.sexp) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_015_PtLimaPt/bin_baker/dune b/src/proto_015_PtLimaPt/bin_baker/dune index ccd9917a3b52acc282742d07e65d3f0942f80243..b77c308dcf44d503fcef45166aae5ed70df9c66f 100644 --- a/src/proto_015_PtLimaPt/bin_baker/dune +++ b/src/proto_015_PtLimaPt/bin_baker/dune @@ -17,7 +17,8 @@ tezos-client-base-unix) (link_flags (:standard) - (:include %{workspace_root}/static-link-flags.sexp)) + (:include %{workspace_root}/static-link-flags.sexp) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_015_PtLimaPt/bin_tx_rollup_client/dune b/src/proto_015_PtLimaPt/bin_tx_rollup_client/dune index d85e9b53f89b5dc4d0d1949f611cc57f3db79d9e..6804039af779fa6d94c2bc2535adca57d4ef4dfc 100644 --- a/src/proto_015_PtLimaPt/bin_tx_rollup_client/dune +++ b/src/proto_015_PtLimaPt/bin_tx_rollup_client/dune @@ -18,7 +18,8 @@ uri) (link_flags (:standard) - (:include %{workspace_root}/static-link-flags.sexp)) + (:include %{workspace_root}/static-link-flags.sexp) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_015_PtLimaPt/bin_tx_rollup_node/dune b/src/proto_015_PtLimaPt/bin_tx_rollup_node/dune index 6e0c0226e30b47b19eea77258b25180b53d66e14..07d339e15ad542daf7a247731e799ce2b187e54b 100644 --- a/src/proto_015_PtLimaPt/bin_tx_rollup_node/dune +++ b/src/proto_015_PtLimaPt/bin_tx_rollup_node/dune @@ -16,7 +16,8 @@ tezos-tx-rollup-015-PtLimaPt) (link_flags (:standard) - (:include %{workspace_root}/static-link-flags.sexp)) + (:include %{workspace_root}/static-link-flags.sexp) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_015_PtLimaPt/lib_benchmark/lib_benchmark_type_inference/test/dune b/src/proto_015_PtLimaPt/lib_benchmark/lib_benchmark_type_inference/test/dune index 19c8e2ef994bf1e0df6589c86070011a051b2179..efc91d435dab6cffe1ed1b095ff6e0e8e6e74cc0 100644 --- a/src/proto_015_PtLimaPt/lib_benchmark/lib_benchmark_type_inference/test/dune +++ b/src/proto_015_PtLimaPt/lib_benchmark/lib_benchmark_type_inference/test/dune @@ -10,6 +10,9 @@ tezos-protocol-015-PtLimaPt tezos-error-monad tezos-client-015-PtLimaPt) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_micheline diff --git a/src/proto_015_PtLimaPt/lib_benchmark/test/dune b/src/proto_015_PtLimaPt/lib_benchmark/test/dune index 156eba4b4846d48e100936c80621bdddf454aded..9c8dbd8e5aec6abcf6dfda87a1910be9281c3386 100644 --- a/src/proto_015_PtLimaPt/lib_benchmark/test/dune +++ b/src/proto_015_PtLimaPt/lib_benchmark/test/dune @@ -19,6 +19,9 @@ tezos-error-monad alcotest-lwt prbnmcn-stats) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals diff --git a/src/proto_015_PtLimaPt/lib_client/test/dune b/src/proto_015_PtLimaPt/lib_client/test/dune index 6b1e8c87b2de6fb3fe1635bfd82d8626989680f6..55b2ca58a0c099c49a3e0708bc7ffa27f25f04cc 100644 --- a/src/proto_015_PtLimaPt/lib_client/test/dune +++ b/src/proto_015_PtLimaPt/lib_client/test/dune @@ -16,6 +16,9 @@ tezos-test-helpers alcotest-lwt qcheck-alcotest) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_015_PtLimaPt/lib_delegate/test/dune b/src/proto_015_PtLimaPt/lib_delegate/test/dune index 50e76c1b522200b9ef8a8a8200167ec4fce43dd5..22cc5db27090dea24bb1bfbc228065eef8ee43cd 100644 --- a/src/proto_015_PtLimaPt/lib_delegate/test/dune +++ b/src/proto_015_PtLimaPt/lib_delegate/test/dune @@ -15,6 +15,9 @@ tezos-crypto alcotest-lwt uri) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_015_PtLimaPt/lib_delegate/test/tenderbrute/dune b/src/proto_015_PtLimaPt/lib_delegate/test/tenderbrute/dune index ce9a7f73823211057bed2181487bf5f890ad976f..5caadce0be7e25414c86e79ea055c339f40e2477 100644 --- a/src/proto_015_PtLimaPt/lib_delegate/test/tenderbrute/dune +++ b/src/proto_015_PtLimaPt/lib_delegate/test/tenderbrute/dune @@ -10,7 +10,9 @@ tezos-protocol-015-PtLimaPt tezos-baking-015-PtLimaPt.tenderbrute) (link_flags - (:standard -linkall)) + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp) + (-linkall)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_015_PtLimaPt/lib_parameters/dune b/src/proto_015_PtLimaPt/lib_parameters/dune index bec4cdb58c294f532879aa9402048f35862130a8..224629b25fdd33007800206c49c9013e53473b52 100644 --- a/src/proto_015_PtLimaPt/lib_parameters/dune +++ b/src/proto_015_PtLimaPt/lib_parameters/dune @@ -23,7 +23,9 @@ tezos-protocol-015-PtLimaPt.parameters tezos-protocol-015-PtLimaPt) (link_flags - (:standard -linkall)) + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp) + (-linkall)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_015_PtLimaPt/lib_plugin/test/dune b/src/proto_015_PtLimaPt/lib_plugin/test/dune index bb03921cf294a57524d6ee398a50f1670b1cee4c..2661968af3cac3fe51a25a71e996c97638545d06 100644 --- a/src/proto_015_PtLimaPt/lib_plugin/test/dune +++ b/src/proto_015_PtLimaPt/lib_plugin/test/dune @@ -20,6 +20,9 @@ tezos-protocol-015-PtLimaPt tezos-protocol-015-PtLimaPt.parameters tezos-015-PtLimaPt-test-helpers) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_015_PtLimaPt/lib_protocol/test/integration/consensus/dune b/src/proto_015_PtLimaPt/lib_protocol/test/integration/consensus/dune index 53e848503adb5506586d2a6254b1f34850f5ea52..019c3ff48270c6d938a214c96e7145703b61c527 100644 --- a/src/proto_015_PtLimaPt/lib_protocol/test/integration/consensus/dune +++ b/src/proto_015_PtLimaPt/lib_protocol/test/integration/consensus/dune @@ -11,6 +11,9 @@ tezos-base-test-helpers tezos-protocol-015-PtLimaPt.parameters tezos-protocol-plugin-015-PtLimaPt) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_015_PtLimaPt/lib_protocol/test/integration/dune b/src/proto_015_PtLimaPt/lib_protocol/test/integration/dune index 20927ff01a9a1dea00849ef93e90da528d3bfafe..6a69c9f280abcc3b4aecefbb6f112239d2c2329c 100644 --- a/src/proto_015_PtLimaPt/lib_protocol/test/integration/dune +++ b/src/proto_015_PtLimaPt/lib_protocol/test/integration/dune @@ -13,6 +13,9 @@ tezos-protocol-015-PtLimaPt.parameters tezos-015-PtLimaPt-test-helpers tezos-base-test-helpers) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_015_PtLimaPt/lib_protocol/test/integration/gas/dune b/src/proto_015_PtLimaPt/lib_protocol/test/integration/gas/dune index 1ebbf074fbdf26ff92f569447d387a6d26c36214..e6d1eefaac399adb67b8d6ca1d8c8889641d7cdb 100644 --- a/src/proto_015_PtLimaPt/lib_protocol/test/integration/gas/dune +++ b/src/proto_015_PtLimaPt/lib_protocol/test/integration/gas/dune @@ -9,6 +9,9 @@ tezos-protocol-015-PtLimaPt tezos-015-PtLimaPt-test-helpers tezos-base-test-helpers) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_015_PtLimaPt/lib_protocol/test/integration/michelson/dune b/src/proto_015_PtLimaPt/lib_protocol/test/integration/michelson/dune index 9885416f29d00f0439a64efebab47929bcd01608..07bfd99420e7c9f9eebbfbcd9e86bbb8880bf058 100644 --- a/src/proto_015_PtLimaPt/lib_protocol/test/integration/michelson/dune +++ b/src/proto_015_PtLimaPt/lib_protocol/test/integration/michelson/dune @@ -16,6 +16,9 @@ tezos-benchmark-type-inference-015-PtLimaPt tezos-protocol-plugin-015-PtLimaPt tezos-protocol-015-PtLimaPt.parameters) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_015_PtLimaPt/lib_protocol/test/integration/operations/dune b/src/proto_015_PtLimaPt/lib_protocol/test/integration/operations/dune index ddd48a47186c4456f7c447196c1610c82a951563..907be740836b3a16d49c040548c4423c387741a3 100644 --- a/src/proto_015_PtLimaPt/lib_protocol/test/integration/operations/dune +++ b/src/proto_015_PtLimaPt/lib_protocol/test/integration/operations/dune @@ -11,6 +11,9 @@ tezos-015-PtLimaPt-test-helpers tezos-base-test-helpers tezos-protocol-plugin-015-PtLimaPt) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_015_PtLimaPt/lib_protocol/test/integration/validate/dune b/src/proto_015_PtLimaPt/lib_protocol/test/integration/validate/dune index 2906bf655ddf129878f04606b1392e5bb63d6cc5..89205ade0c33e6fb48d0fbd841afc1516a047fe5 100644 --- a/src/proto_015_PtLimaPt/lib_protocol/test/integration/validate/dune +++ b/src/proto_015_PtLimaPt/lib_protocol/test/integration/validate/dune @@ -13,6 +13,9 @@ tezos-015-PtLimaPt-test-helpers tezos-base-test-helpers tezos-protocol-plugin-015-PtLimaPt) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_015_PtLimaPt/lib_protocol/test/pbt/dune b/src/proto_015_PtLimaPt/lib_protocol/test/pbt/dune index eb6b66c9e58acc2842965089524b195120474bb7..aedbcc04250482a725180881ce66f6103c08914e 100644 --- a/src/proto_015_PtLimaPt/lib_protocol/test/pbt/dune +++ b/src/proto_015_PtLimaPt/lib_protocol/test/pbt/dune @@ -30,6 +30,9 @@ tezos-benchmark tezos-benchmark-015-PtLimaPt tezos-benchmark-type-inference-015-PtLimaPt) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_015_PtLimaPt/lib_protocol/test/regression/dune b/src/proto_015_PtLimaPt/lib_protocol/test/regression/dune index 1c2ad259ad6bdf135d4e1717f44e6d8a0033741d..74d3f35aa9416c6900187d1ef4a46f101f77aee8 100644 --- a/src/proto_015_PtLimaPt/lib_protocol/test/regression/dune +++ b/src/proto_015_PtLimaPt/lib_protocol/test/regression/dune @@ -32,6 +32,9 @@ (libraries src_proto_015_PtLimaPt_lib_protocol_test_regression_tezt_lib tezt) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (modules main)) (rule diff --git a/src/proto_015_PtLimaPt/lib_protocol/test/unit/dune b/src/proto_015_PtLimaPt/lib_protocol/test/unit/dune index 936817ce05f91f90a7295dd8dca1d3abb9874842..beab42e994f8d94d4f861a7ab3f258785c4e9eef 100644 --- a/src/proto_015_PtLimaPt/lib_protocol/test/unit/dune +++ b/src/proto_015_PtLimaPt/lib_protocol/test/unit/dune @@ -18,6 +18,9 @@ alcotest-lwt tezos-stdlib tezos-scoru-wasm) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_016_PtMumbai/bin_accuser/dune b/src/proto_016_PtMumbai/bin_accuser/dune index e4e777e16b00be76aacf24194edc320d9dd43c3d..18dc48523bc0830604e8a37f362f86692363e1fe 100644 --- a/src/proto_016_PtMumbai/bin_accuser/dune +++ b/src/proto_016_PtMumbai/bin_accuser/dune @@ -17,7 +17,8 @@ tezos-client-base-unix) (link_flags (:standard) - (:include %{workspace_root}/static-link-flags.sexp)) + (:include %{workspace_root}/static-link-flags.sexp) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_016_PtMumbai/bin_baker/dune b/src/proto_016_PtMumbai/bin_baker/dune index 6c7e96d88d16f2cb72c54299071422ffb731fc6c..e23bfec1f9dcde9ac3d8c6f8f546e7928194abc1 100644 --- a/src/proto_016_PtMumbai/bin_baker/dune +++ b/src/proto_016_PtMumbai/bin_baker/dune @@ -17,7 +17,8 @@ tezos-client-base-unix) (link_flags (:standard) - (:include %{workspace_root}/static-link-flags.sexp)) + (:include %{workspace_root}/static-link-flags.sexp) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_client/dune b/src/proto_016_PtMumbai/bin_sc_rollup_client/dune index d6a550094c862e71c114e0736d8340ef9f27b69e..8d4f522e7d4f4decf25ec744a3b27f032582b23c 100644 --- a/src/proto_016_PtMumbai/bin_sc_rollup_client/dune +++ b/src/proto_016_PtMumbai/bin_sc_rollup_client/dune @@ -13,7 +13,8 @@ octez_smart_rollup_client_PtMumbai) (link_flags (:standard) - (:include %{workspace_root}/static-link-flags.sexp)) + (:include %{workspace_root}/static-link-flags.sexp) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_016_PtMumbai/bin_sc_rollup_node/dune b/src/proto_016_PtMumbai/bin_sc_rollup_node/dune index 5db5ae0463f4cf8257e3d9bad862e87326bd6b58..2e989520ffd045583b45a19b956fb8e38b6016c2 100644 --- a/src/proto_016_PtMumbai/bin_sc_rollup_node/dune +++ b/src/proto_016_PtMumbai/bin_sc_rollup_node/dune @@ -18,7 +18,8 @@ octez_smart_rollup_node_PtMumbai) (link_flags (:standard) - (:include %{workspace_root}/static-link-flags.sexp)) + (:include %{workspace_root}/static-link-flags.sexp) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base diff --git a/src/proto_016_PtMumbai/lib_benchmark/lib_benchmark_type_inference/test/dune b/src/proto_016_PtMumbai/lib_benchmark/lib_benchmark_type_inference/test/dune index 0cab546f2f060cf96ca7f6d6879fd630f3277993..402aaff060596b148f80c2645e371909632e7d81 100644 --- a/src/proto_016_PtMumbai/lib_benchmark/lib_benchmark_type_inference/test/dune +++ b/src/proto_016_PtMumbai/lib_benchmark/lib_benchmark_type_inference/test/dune @@ -10,6 +10,9 @@ tezos-protocol-016-PtMumbai tezos-error-monad tezos-client-016-PtMumbai) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_micheline diff --git a/src/proto_016_PtMumbai/lib_benchmark/test/dune b/src/proto_016_PtMumbai/lib_benchmark/test/dune index 894ffc560d82a654849b008d11083be09795365c..51e3e6b5bb6592c87b6a91399e1646f63eba24b1 100644 --- a/src/proto_016_PtMumbai/lib_benchmark/test/dune +++ b/src/proto_016_PtMumbai/lib_benchmark/test/dune @@ -19,6 +19,9 @@ tezos-error-monad alcotest-lwt prbnmcn-stats) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals diff --git a/src/proto_016_PtMumbai/lib_client/test/dune b/src/proto_016_PtMumbai/lib_client/test/dune index c07000c174b09dc89eaec89825f0612212dbd7ba..da0f505de91fc36970f05625764413bff4567076 100644 --- a/src/proto_016_PtMumbai/lib_client/test/dune +++ b/src/proto_016_PtMumbai/lib_client/test/dune @@ -16,6 +16,9 @@ tezos-test-helpers alcotest-lwt qcheck-alcotest) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_016_PtMumbai/lib_dal/test/dune b/src/proto_016_PtMumbai/lib_dal/test/dune index c935b1c299dc433fd2a682e5d1687adce642ee5d..cb711d9608d92afcb9f033d796dd912b197f0961 100644 --- a/src/proto_016_PtMumbai/lib_dal/test/dune +++ b/src/proto_016_PtMumbai/lib_dal/test/dune @@ -10,6 +10,9 @@ tezos-base-test-helpers tezos-016-PtMumbai-test-helpers alcotest-lwt) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_016_PtMumbai/lib_delegate/test/dune b/src/proto_016_PtMumbai/lib_delegate/test/dune index 72f54abeb0b884d96110d595053ae5a2087d1675..b7119036fb2fb42dc8ec2a3e2de3bde5837dbe2c 100644 --- a/src/proto_016_PtMumbai/lib_delegate/test/dune +++ b/src/proto_016_PtMumbai/lib_delegate/test/dune @@ -15,6 +15,9 @@ tezos-crypto alcotest-lwt uri) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_016_PtMumbai/lib_delegate/test/tenderbrute/dune b/src/proto_016_PtMumbai/lib_delegate/test/tenderbrute/dune index afb897a8673d2a033fa1ac1af7aeef815aa26ea0..b00c442c989e9b61041a51f097f49cd5bc2e08e4 100644 --- a/src/proto_016_PtMumbai/lib_delegate/test/tenderbrute/dune +++ b/src/proto_016_PtMumbai/lib_delegate/test/tenderbrute/dune @@ -10,7 +10,9 @@ tezos-protocol-016-PtMumbai tezos-baking-016-PtMumbai.tenderbrute) (link_flags - (:standard -linkall)) + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp) + (-linkall)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_016_PtMumbai/lib_parameters/dune b/src/proto_016_PtMumbai/lib_parameters/dune index e7fb336f03ea39cd52ed847525b1f3ff5c67cf96..c8eac8eba2af88f9529bc04f5dbe4c01aecf9c35 100644 --- a/src/proto_016_PtMumbai/lib_parameters/dune +++ b/src/proto_016_PtMumbai/lib_parameters/dune @@ -23,7 +23,9 @@ tezos-protocol-016-PtMumbai.parameters tezos-protocol-016-PtMumbai) (link_flags - (:standard -linkall)) + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp) + (-linkall)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_016_PtMumbai/lib_plugin/test/dune b/src/proto_016_PtMumbai/lib_plugin/test/dune index b9d98a4c49d81275195f255bdc089b2e95816138..e65402ee45c71c550d97c2e3194cf452b341c355 100644 --- a/src/proto_016_PtMumbai/lib_plugin/test/dune +++ b/src/proto_016_PtMumbai/lib_plugin/test/dune @@ -20,6 +20,9 @@ tezos-protocol-016-PtMumbai tezos-protocol-016-PtMumbai.parameters tezos-016-PtMumbai-test-helpers) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_016_PtMumbai/lib_protocol/test/integration/consensus/dune b/src/proto_016_PtMumbai/lib_protocol/test/integration/consensus/dune index 3290fb708f32e3bb31dc281cc34a8c049607c04b..cca2db9985b034149e06796c0495022bc7f2960a 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/integration/consensus/dune +++ b/src/proto_016_PtMumbai/lib_protocol/test/integration/consensus/dune @@ -11,6 +11,9 @@ tezos-base-test-helpers tezos-protocol-016-PtMumbai.parameters tezos-protocol-plugin-016-PtMumbai) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_016_PtMumbai/lib_protocol/test/integration/dune b/src/proto_016_PtMumbai/lib_protocol/test/integration/dune index 8314557b4134196f8f5d8d3a916accd3897aee20..dfc1915996219da0d68c07995bb79b8a4a2b2c1d 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/integration/dune +++ b/src/proto_016_PtMumbai/lib_protocol/test/integration/dune @@ -13,6 +13,9 @@ tezos-protocol-016-PtMumbai.parameters tezos-016-PtMumbai-test-helpers tezos-base-test-helpers) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_016_PtMumbai/lib_protocol/test/integration/gas/dune b/src/proto_016_PtMumbai/lib_protocol/test/integration/gas/dune index 13d5cf50c0ec46f4a8a0a6fa07425081260fec8a..b7f8e202695e51fb0423ba7fc868bd8d2a38217f 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/integration/gas/dune +++ b/src/proto_016_PtMumbai/lib_protocol/test/integration/gas/dune @@ -9,6 +9,9 @@ tezos-protocol-016-PtMumbai tezos-016-PtMumbai-test-helpers tezos-base-test-helpers) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_016_PtMumbai/lib_protocol/test/integration/michelson/dune b/src/proto_016_PtMumbai/lib_protocol/test/integration/michelson/dune index 8c920e8e026581a8ccff006d5eb23ef7f5c90aa8..b8d464a6c70bf6c13472294280cc2b4f131a8ce4 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/integration/michelson/dune +++ b/src/proto_016_PtMumbai/lib_protocol/test/integration/michelson/dune @@ -16,6 +16,9 @@ tezos-benchmark-type-inference-016-PtMumbai tezos-protocol-plugin-016-PtMumbai tezos-protocol-016-PtMumbai.parameters) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_016_PtMumbai/lib_protocol/test/integration/operations/dune b/src/proto_016_PtMumbai/lib_protocol/test/integration/operations/dune index 2e09908120ca1674f8e9d838c999055268c1cdfb..716886a0132f636d59ffd1218e61a0e930141385 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/integration/operations/dune +++ b/src/proto_016_PtMumbai/lib_protocol/test/integration/operations/dune @@ -11,6 +11,9 @@ tezos-016-PtMumbai-test-helpers tezos-base-test-helpers tezos-protocol-plugin-016-PtMumbai) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_016_PtMumbai/lib_protocol/test/integration/validate/dune b/src/proto_016_PtMumbai/lib_protocol/test/integration/validate/dune index 924a47ba94b0cf6aa2e586720fbaae796d9675fa..aa307be1f4650baec18b9d405952c9a2828e7205 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/integration/validate/dune +++ b/src/proto_016_PtMumbai/lib_protocol/test/integration/validate/dune @@ -13,6 +13,9 @@ tezos-016-PtMumbai-test-helpers tezos-base-test-helpers tezos-protocol-plugin-016-PtMumbai) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_016_PtMumbai/lib_protocol/test/pbt/dune b/src/proto_016_PtMumbai/lib_protocol/test/pbt/dune index ac661f740359aef8e5f9e2ffb80c36fc1bcc99ed..481928f59e62497d8a52c5f402d2873f6735e917 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/pbt/dune +++ b/src/proto_016_PtMumbai/lib_protocol/test/pbt/dune @@ -38,6 +38,9 @@ tezos-crypto-dal tezos-base-test-helpers tezos-protocol-016-PtMumbai.parameters) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_016_PtMumbai/lib_protocol/test/regression/dune b/src/proto_016_PtMumbai/lib_protocol/test/regression/dune index 65df3f9f2d155581b4f834c289461aa82c9fb3dc..0f6473eeaba528c182e5dbbbade3ec5c989a5353 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/regression/dune +++ b/src/proto_016_PtMumbai/lib_protocol/test/regression/dune @@ -32,6 +32,9 @@ (libraries src_proto_016_PtMumbai_lib_protocol_test_regression_tezt_lib tezt) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (modules main)) (rule diff --git a/src/proto_016_PtMumbai/lib_protocol/test/unit/dune b/src/proto_016_PtMumbai/lib_protocol/test/unit/dune index c5be0318f2287da45dce1a67caadeb2567e9f04b..8c380725b8b1352c20a094590d524195ab837128 100644 --- a/src/proto_016_PtMumbai/lib_protocol/test/unit/dune +++ b/src/proto_016_PtMumbai/lib_protocol/test/unit/dune @@ -21,6 +21,9 @@ tezos-crypto-dal tezos-scoru-wasm tezos-webassembly-interpreter-extra) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_alpha/bin_accuser/dune b/src/proto_alpha/bin_accuser/dune index bfa85eafe9cf8da4c83209798089a0af7e3f4943..ca04550668a460e2bbeac3a35a3c1f0a3918d212 100644 --- a/src/proto_alpha/bin_accuser/dune +++ b/src/proto_alpha/bin_accuser/dune @@ -17,7 +17,8 @@ tezos-client-base-unix) (link_flags (:standard) - (:include %{workspace_root}/static-link-flags.sexp)) + (:include %{workspace_root}/static-link-flags.sexp) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_alpha/bin_baker/dune b/src/proto_alpha/bin_baker/dune index 68fc1d13b200fa94a4ad67a7dcee22dc81c08a4d..9517ac31650e587c10ccda1433dd70621c735efe 100644 --- a/src/proto_alpha/bin_baker/dune +++ b/src/proto_alpha/bin_baker/dune @@ -17,7 +17,8 @@ tezos-client-base-unix) (link_flags (:standard) - (:include %{workspace_root}/static-link-flags.sexp)) + (:include %{workspace_root}/static-link-flags.sexp) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_alpha/bin_sc_rollup_client/dune b/src/proto_alpha/bin_sc_rollup_client/dune index 996260fe7cba5232d0289c73ffb665354b1ecf36..eb84c18f51427c2f8f3e66f1b33180fa91c0ac09 100644 --- a/src/proto_alpha/bin_sc_rollup_client/dune +++ b/src/proto_alpha/bin_sc_rollup_client/dune @@ -13,7 +13,8 @@ octez_smart_rollup_client_alpha) (link_flags (:standard) - (:include %{workspace_root}/static-link-flags.sexp)) + (:include %{workspace_root}/static-link-flags.sexp) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_alpha/bin_sc_rollup_node/dune b/src/proto_alpha/bin_sc_rollup_node/dune index 45a95636a605452686c43bf9850c6ecbfe684ab5..d2f76e93346ee205a7b2a1982b7e7b3a9551214b 100644 --- a/src/proto_alpha/bin_sc_rollup_node/dune +++ b/src/proto_alpha/bin_sc_rollup_node/dune @@ -18,7 +18,8 @@ octez_smart_rollup_node_alpha) (link_flags (:standard) - (:include %{workspace_root}/static-link-flags.sexp)) + (:include %{workspace_root}/static-link-flags.sexp) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base diff --git a/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/test/dune b/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/test/dune index de2cd72795d6617c86be54a5fc4f02a3cf5c6a13..80cc7e281ace3c09ec292cf07a4d7d0ed6e10ead 100644 --- a/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/test/dune +++ b/src/proto_alpha/lib_benchmark/lib_benchmark_type_inference/test/dune @@ -10,6 +10,9 @@ tezos-protocol-alpha tezos-error-monad tezos-client-alpha) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_micheline diff --git a/src/proto_alpha/lib_benchmark/test/dune b/src/proto_alpha/lib_benchmark/test/dune index 6cf42fc7f09e152d8453fd9cdbfe2a71ee7dbdf2..31c0deaa85175729ad83e9e836e946545c2dfc14 100644 --- a/src/proto_alpha/lib_benchmark/test/dune +++ b/src/proto_alpha/lib_benchmark/test/dune @@ -19,6 +19,9 @@ tezos-error-monad alcotest-lwt prbnmcn-stats) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives.Error_monad.Legacy_monad_globals diff --git a/src/proto_alpha/lib_client/test/dune b/src/proto_alpha/lib_client/test/dune index 5cea59b3fe64e7b7ed91cc3f7e92e33988840a5d..54ce1f79c5c471dbac33b6d000586917d544662d 100644 --- a/src/proto_alpha/lib_client/test/dune +++ b/src/proto_alpha/lib_client/test/dune @@ -16,6 +16,9 @@ tezos-test-helpers alcotest-lwt qcheck-alcotest) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_alpha/lib_dac/test/dune b/src/proto_alpha/lib_dac/test/dune index 29ca0f9c90db6ebbfeb470a412853abc58eb5988..1240a9a3b3678ca2086f38887b01c2c9667846c8 100644 --- a/src/proto_alpha/lib_dac/test/dune +++ b/src/proto_alpha/lib_dac/test/dune @@ -11,6 +11,9 @@ tezos-alpha-test-helpers tezos_dac_node_lib alcotest-lwt) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_alpha/lib_dal/test/dune b/src/proto_alpha/lib_dal/test/dune index e5272d58827c35b0c44c71542b3403853e105457..101de0486cc48e89bbe0a16680241f5808baac0f 100644 --- a/src/proto_alpha/lib_dal/test/dune +++ b/src/proto_alpha/lib_dal/test/dune @@ -10,6 +10,9 @@ tezos-base-test-helpers tezos-alpha-test-helpers alcotest-lwt) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_alpha/lib_delegate/test/dune b/src/proto_alpha/lib_delegate/test/dune index e2d734e974fb1cc65ae0314e23f00955baf63017..16fbb32f61a1334b478c52c64680f78bde5de48b 100644 --- a/src/proto_alpha/lib_delegate/test/dune +++ b/src/proto_alpha/lib_delegate/test/dune @@ -15,6 +15,9 @@ tezos-crypto alcotest-lwt uri) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_alpha/lib_delegate/test/tenderbrute/dune b/src/proto_alpha/lib_delegate/test/tenderbrute/dune index aec676a976752e8bd211794be15bc42c3ea7c68a..6df2252f2558db4ef0c4e0a41165238af028553e 100644 --- a/src/proto_alpha/lib_delegate/test/tenderbrute/dune +++ b/src/proto_alpha/lib_delegate/test/tenderbrute/dune @@ -10,7 +10,9 @@ tezos-protocol-alpha tezos-baking-alpha.tenderbrute) (link_flags - (:standard -linkall)) + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp) + (-linkall)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_alpha/lib_parameters/dune b/src/proto_alpha/lib_parameters/dune index ba6228fc1b09fccaf7fc86696108c3dd273ee673..58bd179ad0f8f34d580fe896cd9d7158323aaa24 100644 --- a/src/proto_alpha/lib_parameters/dune +++ b/src/proto_alpha/lib_parameters/dune @@ -23,7 +23,9 @@ tezos-protocol-alpha.parameters tezos-protocol-alpha) (link_flags - (:standard -linkall)) + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp) + (-linkall)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_alpha/lib_plugin/test/dune b/src/proto_alpha/lib_plugin/test/dune index fd0c4a580d8bf95133c6d2568519a353806538b6..c59ac8e2345b94ad3023b692fdb54a6e67add075 100644 --- a/src/proto_alpha/lib_plugin/test/dune +++ b/src/proto_alpha/lib_plugin/test/dune @@ -20,6 +20,9 @@ tezos-protocol-alpha tezos-protocol-alpha.parameters tezos-alpha-test-helpers) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_alpha/lib_protocol/test/integration/consensus/dune b/src/proto_alpha/lib_protocol/test/integration/consensus/dune index 4baf3031174a37583c6ae9465eedbe28da885c2f..7c544a7fb9e8bb7f43d1523407a0e59f6ffa23d3 100644 --- a/src/proto_alpha/lib_protocol/test/integration/consensus/dune +++ b/src/proto_alpha/lib_protocol/test/integration/consensus/dune @@ -11,6 +11,9 @@ tezos-base-test-helpers tezos-protocol-alpha.parameters tezos-protocol-plugin-alpha) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_alpha/lib_protocol/test/integration/dune b/src/proto_alpha/lib_protocol/test/integration/dune index fafe56f8b6ee081fce1a40fa91b86bcb27ed9bfc..076c0eef16fe2460da79f1c4a242c7743ac9b91e 100644 --- a/src/proto_alpha/lib_protocol/test/integration/dune +++ b/src/proto_alpha/lib_protocol/test/integration/dune @@ -13,6 +13,9 @@ tezos-protocol-alpha.parameters tezos-alpha-test-helpers tezos-base-test-helpers) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_alpha/lib_protocol/test/integration/gas/dune b/src/proto_alpha/lib_protocol/test/integration/gas/dune index 82514b6a297a0dcb1641550265cba1982685ee59..0615a57c105631d593b0bc87ffc01842a12e74a9 100644 --- a/src/proto_alpha/lib_protocol/test/integration/gas/dune +++ b/src/proto_alpha/lib_protocol/test/integration/gas/dune @@ -9,6 +9,9 @@ tezos-protocol-alpha tezos-alpha-test-helpers tezos-base-test-helpers) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_alpha/lib_protocol/test/integration/michelson/dune b/src/proto_alpha/lib_protocol/test/integration/michelson/dune index 5a9afbc72eafb110dcbcbc54d71a6ef791d40dae..a724d96f524e3a9d5f010aa40a5355ea3130efbe 100644 --- a/src/proto_alpha/lib_protocol/test/integration/michelson/dune +++ b/src/proto_alpha/lib_protocol/test/integration/michelson/dune @@ -16,6 +16,9 @@ tezos-benchmark-type-inference-alpha tezos-protocol-plugin-alpha tezos-protocol-alpha.parameters) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_alpha/lib_protocol/test/integration/operations/dune b/src/proto_alpha/lib_protocol/test/integration/operations/dune index 161980ee0436e547a85ed81520df4423b65b26ee..d9d62ec910588d7be33cd8445125095ea1c9fb72 100644 --- a/src/proto_alpha/lib_protocol/test/integration/operations/dune +++ b/src/proto_alpha/lib_protocol/test/integration/operations/dune @@ -11,6 +11,9 @@ tezos-alpha-test-helpers tezos-base-test-helpers tezos-protocol-plugin-alpha) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_alpha/lib_protocol/test/integration/validate/dune b/src/proto_alpha/lib_protocol/test/integration/validate/dune index 0a257e09a435a5a269956f20260b7092491cb451..25989b2794b814f8663e0b699e68d8cf5162c75b 100644 --- a/src/proto_alpha/lib_protocol/test/integration/validate/dune +++ b/src/proto_alpha/lib_protocol/test/integration/validate/dune @@ -13,6 +13,9 @@ tezos-alpha-test-helpers tezos-base-test-helpers tezos-protocol-plugin-alpha) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_alpha/lib_protocol/test/pbt/dune b/src/proto_alpha/lib_protocol/test/pbt/dune index d6cfea4da83438d1b365aa324e855635446bce9d..a1ca1c818fa8990d860cc8c7d733b67fec011448 100644 --- a/src/proto_alpha/lib_protocol/test/pbt/dune +++ b/src/proto_alpha/lib_protocol/test/pbt/dune @@ -37,6 +37,9 @@ tezos-crypto-dal tezos-base-test-helpers tezos-protocol-alpha.parameters) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/src/proto_alpha/lib_protocol/test/regression/dune b/src/proto_alpha/lib_protocol/test/regression/dune index 73806cb913affc601ffded43e515e6b595b57efa..31fd134e85ece0c8dc19f5e1145c7654208295fd 100644 --- a/src/proto_alpha/lib_protocol/test/regression/dune +++ b/src/proto_alpha/lib_protocol/test/regression/dune @@ -32,6 +32,9 @@ (libraries src_proto_alpha_lib_protocol_test_regression_tezt_lib tezt) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (modules main)) (rule diff --git a/src/proto_alpha/lib_protocol/test/unit/dune b/src/proto_alpha/lib_protocol/test/unit/dune index 7af7d2172cf8a953eb975261a1668a257e70078f..977ac85da2d1b81487549f64c7f998ca8253e07d 100644 --- a/src/proto_alpha/lib_protocol/test/unit/dune +++ b/src/proto_alpha/lib_protocol/test/unit/dune @@ -21,6 +21,9 @@ tezos-crypto-dal tezos-scoru-wasm tezos-webassembly-interpreter-extra) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezos_base.TzPervasives diff --git a/tezt/long_tests/dune b/tezt/long_tests/dune index 266de14b23729cfef4357b7238d713dd2cdf0d50..167f82f5acea7abbd56fb786cbb34388ef889d1f 100644 --- a/tezt/long_tests/dune +++ b/tezt/long_tests/dune @@ -21,4 +21,5 @@ -open Tezt_performance_regression -open Tezos_lwt_result_stdlib -open Tezos_event_logging + (:include %{workspace_root}/macos-link-flags.sexp) ))) diff --git a/tezt/manual_tests/dune b/tezt/manual_tests/dune index dfa4fa288e59b4f7e29e83a3174cdcbf024ca7a4..fb50e0ac32216ca746d87878ee0df132a5e3519d 100644 --- a/tezt/manual_tests/dune +++ b/tezt/manual_tests/dune @@ -3,4 +3,6 @@ (libraries tezt-tezos yes_wallet_lib) - (flags (:standard -open Tezt -open Tezt_tezos -open Tezt.Base))) + (flags (:standard + (:include %{workspace_root}/macos-link-flags.sexp) + -open Tezt -open Tezt_tezos -open Tezt.Base))) diff --git a/tezt/tests/dune b/tezt/tests/dune index 45bf55cae7ccc3e36c5a7a7f3f043a1b0c0d4458..5c8aae155ecb1db0026f5effb16e46742ed5aa4d 100644 --- a/tezt/tests/dune +++ b/tezt/tests/dune @@ -26,6 +26,9 @@ src_lib_error_monad_test_tezt_lib src_lib_benchmark_test_tezt_lib src_lib_base_test_tezt_lib) + (link_flags + (:standard) + (:include %{workspace_root}/macos-link-flags.sexp)) (flags (:standard) -open Tezt diff --git a/tezt/vesting_contract_test/dune b/tezt/vesting_contract_test/dune index 2fddb3077d7155970d93cbe625cd20c300424530..08dc551f629536e530d2abaa6137955ae3bdc94c 100644 --- a/tezt/vesting_contract_test/dune +++ b/tezt/vesting_contract_test/dune @@ -6,4 +6,6 @@ tezos-protocol-alpha tezt-tezos ptime) - (flags (:standard -open Tezt -open Tezt_tezos -open Tezt.Base -open Tezos_stdlib))) + (flags (:standard + (:include %{workspace_root}/macos-link-flags.sexp) + -open Tezt -open Tezt_tezos -open Tezt.Base -open Tezos_stdlib)))