From 1d2030101b309f031dde4231f6253b8459b2c1f2 Mon Sep 17 00:00:00 2001 From: "iguerNL@Functori" Date: Thu, 23 Feb 2023 08:10:15 +0100 Subject: [PATCH 1/7] Build: add a target 'macos-link-flags.sexp' in the root dune file --- dune | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dune b/dune index cc0b5a6a1635..720354e9e25d 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 '()'")))) -- GitLab From 2fbe17ae07a960d8b7d69704ec5955c8a0333edf Mon Sep 17 00:00:00 2001 From: "iguerNL@Functori" Date: Wed, 22 Feb 2023 08:02:28 +0100 Subject: [PATCH 2/7] Manifest: add a 'with_macos_security_framework' flag --- manifest/manifest.ml | 12 ++++++++++-- manifest/manifest.mli | 14 ++++++++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/manifest/manifest.ml b/manifest/manifest.ml index b8ff8c90f305..a3d08d1b303b 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 diff --git a/manifest/manifest.mli b/manifest/manifest.mli index 83cee60178c6..19f10e349dee 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 -- GitLab From 5c93e8a555bc1828154cd31ea21c9c2e51560535 Mon Sep 17 00:00:00 2001 From: "iguerNL@Functori" Date: Thu, 23 Feb 2023 08:26:46 +0100 Subject: [PATCH 3/7] Manifest: Refactor link_flags section to easily extend it --- manifest/manifest.ml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/manifest/manifest.ml b/manifest/manifest.ml index a3d08d1b303b..1dcab307faaa 100644 --- a/manifest/manifest.ml +++ b/manifest/manifest.ml @@ -2013,16 +2013,17 @@ 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 includes_list = static_flags in + if linkall then Some (Dune.[S ":standard"; S "-linkall"] :: includes_list) + else + match includes_list with + | [] -> None + | _ -> Some (Dune.[S ":standard"] :: includes_list) in let open_flags : Dune.s_expr list = internal.opens |> List.map (fun m -> Dune.(H [S "-open"; S m])) -- GitLab From 05102f460b4ef57a7b8846ab012d2acb078cb946 Mon Sep 17 00:00:00 2001 From: "iguerNL@Functori" Date: Thu, 23 Feb 2023 08:28:21 +0100 Subject: [PATCH 4/7] Manifest: include macos-link-flags.sexp when with_macos_security_framework --- manifest/manifest.ml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/manifest/manifest.ml b/manifest/manifest.ml index 1dcab307faaa..70979abc52e0 100644 --- a/manifest/manifest.ml +++ b/manifest/manifest.ml @@ -2018,12 +2018,15 @@ let generate_dune (internal : Target.internal) = [Dune.[S ":include"; S "%{workspace_root}/static-link-flags.sexp"]] else [] in - let includes_list = static_flags in - if linkall then Some (Dune.[S ":standard"; S "-linkall"] :: includes_list) - else - match includes_list with - | [] -> None - | _ -> Some (Dune.[S ":standard"] :: includes_list) + 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])) -- GitLab From 1cecd23c4c6d7b8300123f0aa1a25d130f4d8b3b Mon Sep 17 00:00:00 2001 From: "iguerNL@Functori" Date: Thu, 23 Feb 2023 08:29:43 +0100 Subject: [PATCH 5/7] Manifest: set with_macos_security_framework=true for failing targets on Mac --- manifest/main.ml | 61 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 59 insertions(+), 2 deletions(-) diff --git a/manifest/main.ml b/manifest/main.ml index 59449031b317..3250c44e70d0 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 -- GitLab From 6f4a80c26073b09c0fb4b7ded02d8288fdd4aee4 Mon Sep 17 00:00:00 2001 From: "iguerNL@Functori" Date: Wed, 22 Feb 2023 16:23:55 +0100 Subject: [PATCH 6/7] Build: macOS build issue: Manually modify dune files, not updated by manifest --- docs/doc_gen/dune | 3 ++- docs/doc_gen/errors/dune | 3 ++- tezt/long_tests/dune | 1 + tezt/manual_tests/dune | 4 +++- tezt/vesting_contract_test/dune | 4 +++- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/docs/doc_gen/dune b/docs/doc_gen/dune index 34e0e7f52ab2..8c6aa0a8377e 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 26e26812abea..aca73b55195e 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/tezt/long_tests/dune b/tezt/long_tests/dune index 266de14b2372..167f82f5acea 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 dfa4fa288e59..fb50e0ac3221 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/vesting_contract_test/dune b/tezt/vesting_contract_test/dune index 2fddb3077d71..08dc551f6295 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))) -- GitLab From c2eaad8de5418eb94d8d0e12a39fd340d981fa8d Mon Sep 17 00:00:00 2001 From: "iguerNL@Functori" Date: Thu, 23 Feb 2023 11:11:17 +0100 Subject: [PATCH 7/7] Build: (auto-)regenerate dune files --- devtools/get_contracts/dune | 3 +++ devtools/yes_wallet/dune | 3 +++ src/bin_client/dune | 6 ++++-- src/bin_codec/dune | 6 ++++-- src/bin_dac_node/dune | 3 ++- src/bin_dal_node/dune | 3 ++- src/bin_node/dune | 6 ++++-- src/bin_proxy_server/dune | 6 ++++-- src/bin_signer/dune | 3 ++- src/bin_snoop/dune | 6 ++++-- src/bin_tps_evaluation/dune | 3 +++ src/bin_wasm_debugger/dune | 3 ++- src/lib_benchmark/lib_micheline_rewriting/test/dune | 3 +++ src/lib_client_base/test/dune | 3 +++ src/lib_client_base_unix/test/dune | 3 +++ src/lib_dac_node/test/dune | 3 +++ src/lib_dal_node/test/dune | 3 +++ src/lib_error_monad/test/dune | 6 ++++++ src/lib_hacl/gen/dune | 3 +++ src/lib_mockup/test/dune | 3 +++ src/lib_p2p/test/dune | 3 ++- src/lib_protocol_compiler/bin/dune | 10 ++++++---- src/lib_proxy/test/dune | 3 +++ src/lib_sapling/test/dune | 6 +++++- src/lib_shell/test/dune | 3 +++ src/lib_signer_backends/test/dune | 3 +++ src/lib_signer_backends/unix/test/dune | 3 +++ src/lib_stdlib/test/dune | 6 ++++++ src/lib_store/unix/test/dune | 3 +++ src/proto_011_PtHangz2/lib_client/test/dune | 3 +++ src/proto_011_PtHangz2/lib_parameters/dune | 4 +++- src/proto_012_Psithaca/lib_client/test/dune | 3 +++ src/proto_012_Psithaca/lib_parameters/dune | 4 +++- src/proto_013_PtJakart/lib_client/test/dune | 3 +++ src/proto_013_PtJakart/lib_parameters/dune | 4 +++- src/proto_014_PtKathma/lib_client/test/dune | 3 +++ src/proto_014_PtKathma/lib_parameters/dune | 4 +++- src/proto_015_PtLimaPt/bin_accuser/dune | 3 ++- src/proto_015_PtLimaPt/bin_baker/dune | 3 ++- src/proto_015_PtLimaPt/bin_tx_rollup_client/dune | 3 ++- src/proto_015_PtLimaPt/bin_tx_rollup_node/dune | 3 ++- .../lib_benchmark_type_inference/test/dune | 3 +++ src/proto_015_PtLimaPt/lib_benchmark/test/dune | 3 +++ src/proto_015_PtLimaPt/lib_client/test/dune | 3 +++ src/proto_015_PtLimaPt/lib_delegate/test/dune | 3 +++ .../lib_delegate/test/tenderbrute/dune | 4 +++- src/proto_015_PtLimaPt/lib_parameters/dune | 4 +++- src/proto_015_PtLimaPt/lib_plugin/test/dune | 3 +++ .../lib_protocol/test/integration/consensus/dune | 3 +++ .../lib_protocol/test/integration/dune | 3 +++ .../lib_protocol/test/integration/gas/dune | 3 +++ .../lib_protocol/test/integration/michelson/dune | 3 +++ .../lib_protocol/test/integration/operations/dune | 3 +++ .../lib_protocol/test/integration/validate/dune | 3 +++ src/proto_015_PtLimaPt/lib_protocol/test/pbt/dune | 3 +++ .../lib_protocol/test/regression/dune | 3 +++ src/proto_015_PtLimaPt/lib_protocol/test/unit/dune | 3 +++ src/proto_016_PtMumbai/bin_accuser/dune | 3 ++- src/proto_016_PtMumbai/bin_baker/dune | 3 ++- src/proto_016_PtMumbai/bin_sc_rollup_client/dune | 3 ++- src/proto_016_PtMumbai/bin_sc_rollup_node/dune | 3 ++- .../lib_benchmark_type_inference/test/dune | 3 +++ src/proto_016_PtMumbai/lib_benchmark/test/dune | 3 +++ src/proto_016_PtMumbai/lib_client/test/dune | 3 +++ src/proto_016_PtMumbai/lib_dal/test/dune | 3 +++ src/proto_016_PtMumbai/lib_delegate/test/dune | 3 +++ .../lib_delegate/test/tenderbrute/dune | 4 +++- src/proto_016_PtMumbai/lib_parameters/dune | 4 +++- src/proto_016_PtMumbai/lib_plugin/test/dune | 3 +++ .../lib_protocol/test/integration/consensus/dune | 3 +++ .../lib_protocol/test/integration/dune | 3 +++ .../lib_protocol/test/integration/gas/dune | 3 +++ .../lib_protocol/test/integration/michelson/dune | 3 +++ .../lib_protocol/test/integration/operations/dune | 3 +++ .../lib_protocol/test/integration/validate/dune | 3 +++ src/proto_016_PtMumbai/lib_protocol/test/pbt/dune | 3 +++ .../lib_protocol/test/regression/dune | 3 +++ src/proto_016_PtMumbai/lib_protocol/test/unit/dune | 3 +++ src/proto_alpha/bin_accuser/dune | 3 ++- src/proto_alpha/bin_baker/dune | 3 ++- src/proto_alpha/bin_sc_rollup_client/dune | 3 ++- src/proto_alpha/bin_sc_rollup_node/dune | 3 ++- .../lib_benchmark_type_inference/test/dune | 3 +++ src/proto_alpha/lib_benchmark/test/dune | 3 +++ src/proto_alpha/lib_client/test/dune | 3 +++ src/proto_alpha/lib_dac/test/dune | 3 +++ src/proto_alpha/lib_dal/test/dune | 3 +++ src/proto_alpha/lib_delegate/test/dune | 3 +++ src/proto_alpha/lib_delegate/test/tenderbrute/dune | 4 +++- src/proto_alpha/lib_parameters/dune | 4 +++- src/proto_alpha/lib_plugin/test/dune | 3 +++ .../lib_protocol/test/integration/consensus/dune | 3 +++ src/proto_alpha/lib_protocol/test/integration/dune | 3 +++ src/proto_alpha/lib_protocol/test/integration/gas/dune | 3 +++ .../lib_protocol/test/integration/michelson/dune | 3 +++ .../lib_protocol/test/integration/operations/dune | 3 +++ .../lib_protocol/test/integration/validate/dune | 3 +++ src/proto_alpha/lib_protocol/test/pbt/dune | 3 +++ src/proto_alpha/lib_protocol/test/regression/dune | 3 +++ src/proto_alpha/lib_protocol/test/unit/dune | 3 +++ tezt/tests/dune | 3 +++ 101 files changed, 302 insertions(+), 42 deletions(-) diff --git a/devtools/get_contracts/dune b/devtools/get_contracts/dune index 5e692d4f303f..2a5fd812373d 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 96a34cd7cbc7..db7b4a43a22d 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/src/bin_client/dune b/src/bin_client/dune index eb84159673ce..5e5292facebd 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 d974cd3ebe90..595b558ab5e7 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 d0b40145ee2b..929f906f7a4b 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 e27a803799ea..574e3fca90fd 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 c4f17348c446..8d1b26306d67 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 bcf14c15d6f6..af38fab7c2ce 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 3f25945c6afc..74014166bbe7 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 35b64bfc1339..d8e68c3bac36 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 0493317c01a8..f5ea621ab352 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 e9c4cde46b11..9e07308ead45 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 135a05a95c97..560949a46a41 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 fb8dfdfb7e0d..3a85ca3c6e5b 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 1f50e8e22026..1e753f34f67e 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 1205238ef9a2..2c03c2b08ec9 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 151a18c0f912..397ba498cd58 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 384c1c1638e7..7d2366d55372 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 ecdf75560a84..20b71609231a 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 94cc36ed3b1d..1f38f01fe792 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 18ac112ca60d..2cf1ea360957 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 bbc16b330135..82d225be9190 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 17c97ef2ac50..124fbe6f55ed 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 cbda583e54d6..660c75094155 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 6bf2e9f5f9cd..e6b64d56587c 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 87c7885348c9..d0496d1629d5 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 57e58af23ed9..c5a8b13de2ff 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 fb6ca69fe289..71eddb64e67e 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 ba2a513562b0..86954a391156 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 aaa81df72f21..14d37101048b 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 39df9f62b2a5..1fd3d4da27ec 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 ce61f2908aca..0f8aaa93fdb6 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 732a223c033d..ed7923c17602 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 0456cb21a63e..85d3a23a8b4b 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 7836339820f8..77bab634c5f8 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 82bc8648e3b7..2c21737c2827 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 68ada79d8d4e..d57c5b30672c 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 42c36f538c1b..470b1da3b6cd 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 ccd9917a3b52..b77c308dcf44 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 d85e9b53f89b..6804039af779 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 6e0c0226e30b..07d339e15ad5 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 19c8e2ef994b..efc91d435dab 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 156eba4b4846..9c8dbd8e5aec 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 6b1e8c87b2de..55b2ca58a0c0 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 50e76c1b5222..22cc5db27090 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 ce9a7f738232..5caadce0be7e 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 bec4cdb58c29..224629b25fdd 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 bb03921cf294..2661968af3ca 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 53e848503adb..019c3ff48270 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 20927ff01a9a..6a69c9f280ab 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 1ebbf074fbdf..e6d1eefaac39 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 9885416f29d0..07bfd99420e7 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 ddd48a47186c..907be740836b 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 2906bf655ddf..89205ade0c33 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 eb6b66c9e58a..aedbcc042504 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 1c2ad259ad6b..74d3f35aa941 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 936817ce05f9..beab42e994f8 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 e4e777e16b00..18dc48523bc0 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 6c7e96d88d16..e23bfec1f9dc 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 d6a550094c86..8d4f522e7d4f 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 5db5ae0463f4..2e989520ffd0 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 0cab546f2f06..402aaff06059 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 894ffc560d82..51e3e6b5bb65 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 c07000c174b0..da0f505de91f 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 c935b1c299dc..cb711d9608d9 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 72f54abeb0b8..b7119036fb2f 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 afb897a8673d..b00c442c989e 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 e7fb336f03ea..c8eac8eba2af 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 b9d98a4c49d8..e65402ee45c7 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 3290fb708f32..cca2db9985b0 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 8314557b4134..dfc191599621 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 13d5cf50c0ec..b7f8e202695e 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 8c920e8e0265..b8d464a6c70b 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 2e09908120ca..716886a0132f 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 924a47ba94b0..aa307be1f465 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 ac661f740359..481928f59e62 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 65df3f9f2d15..0f6473eeaba5 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 c5be0318f228..8c380725b8b1 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 bfa85eafe9cf..ca04550668a4 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 68fc1d13b200..9517ac31650e 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 996260fe7cba..eb84c18f5142 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 45a95636a605..d2f76e93346e 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 de2cd72795d6..80cc7e281ace 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 6cf42fc7f09e..31c0deaa8517 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 5cea59b3fe64..54ce1f79c5c4 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 29ca0f9c90db..1240a9a3b367 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 e5272d58827c..101de0486cc4 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 e2d734e974fb..16fbb32f61a1 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 aec676a97675..6df2252f2558 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 ba6228fc1b09..58bd179ad0f8 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 fd0c4a580d8b..c59ac8e2345b 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 4baf3031174a..7c544a7fb9e8 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 fafe56f8b6ee..076c0eef16fe 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 82514b6a297a..0615a57c1056 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 5a9afbc72eaf..a724d96f524e 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 161980ee0436..d9d62ec91058 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 0a257e09a435..25989b2794b8 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 d6cfea4da834..a1ca1c818fa8 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 73806cb913af..31fd134e85ec 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 7af7d2172cf8..977ac85da2d1 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/tests/dune b/tezt/tests/dune index 45bf55cae7cc..5c8aae155ecb 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 -- GitLab