From fe6bd798ca408a5523756d97cc8f0cf243608db1 Mon Sep 17 00:00:00 2001 From: Hugo Heuzard Date: Tue, 30 Nov 2021 15:01:17 +0100 Subject: [PATCH] Build: use O3 pervasively with release and static profiles --- dune | 4 ---- dune-workspace | 5 +++++ src/bin_client/dune | 4 +--- src/bin_codec/dune | 4 +--- src/bin_node/dune | 3 +-- src/bin_proxy_server/dune | 3 +-- src/bin_signer/dune | 4 +--- src/bin_snoop/dune | 3 +-- src/bin_validation/dune | 2 -- src/lib_protocol_compiler/dune | 3 +-- src/proto_010_PtGRANAD/bin_accuser/dune | 4 +--- src/proto_010_PtGRANAD/bin_baker/dune | 4 +--- src/proto_010_PtGRANAD/bin_endorser/dune | 4 +--- src/proto_011_PtHangz2/bin_accuser/dune | 4 +--- src/proto_011_PtHangz2/bin_baker/dune | 4 +--- src/proto_011_PtHangz2/bin_endorser/dune | 4 +--- src/proto_alpha/bin_accuser/dune | 4 +--- src/proto_alpha/bin_baker/dune | 4 +--- 18 files changed, 20 insertions(+), 47 deletions(-) diff --git a/dune b/dune index 995521bd50a1..07287393eb7e 100644 --- a/dune +++ b/dune @@ -1,5 +1 @@ -(env - (release - (ocamlopt_flags (:standard -O3)))) - (vendored_dirs vendors) diff --git a/dune-workspace b/dune-workspace index 45acd3f08847..844ae5c2cee3 100644 --- a/dune-workspace +++ b/dune-workspace @@ -1 +1,6 @@ (lang dune 2.7) + +(env + (static (ocamlopt_flags (:standard -O3))) + (release (ocamlopt_flags (:standard -O3))) +) \ No newline at end of file diff --git a/src/bin_client/dune b/src/bin_client/dune index ec9b8c5a5db9..9ab1908d3f0c 100644 --- a/src/bin_client/dune +++ b/src/bin_client/dune @@ -4,9 +4,7 @@ (env (static - (flags (:standard -ccopt -static -cclib "-lusb-1.0 -lhidapi-libusb -ludev")) - (ocamlopt_flags (:standard -O3))) - (release (ocamlopt_flags (:standard -O3)))) + (flags (:standard -ccopt -static -cclib "-lusb-1.0 -lhidapi-libusb -ludev")))) (executables (names main_client main_admin) diff --git a/src/bin_codec/dune b/src/bin_codec/dune index 202b3cdfd95c..421a68bb9d60 100644 --- a/src/bin_codec/dune +++ b/src/bin_codec/dune @@ -1,8 +1,6 @@ (env (static - (flags (:standard -ccopt -static -cclib "-lusb-1.0 -lhidapi-libusb -ludev")) - (ocamlopt_flags (:standard -O3))) - (release (ocamlopt_flags (:standard -O3)))) + (flags (:standard -ccopt -static -cclib "-lusb-1.0 -lhidapi-libusb -ludev")))) (executable (name codec) diff --git a/src/bin_node/dune b/src/bin_node/dune index 92ec6d879d47..dbeca49a8e80 100644 --- a/src/bin_node/dune +++ b/src/bin_node/dune @@ -8,8 +8,7 @@ ; "void_for_linking". (env - (static (flags (:standard -ccopt -static)) (ocamlopt_flags (:standard -O3))) - (release (ocamlopt_flags (:standard -O3)))) + (static (flags (:standard -ccopt -static)))) (executable (name main) diff --git a/src/bin_proxy_server/dune b/src/bin_proxy_server/dune index f23a17bb14ed..21479e2f9f19 100644 --- a/src/bin_proxy_server/dune +++ b/src/bin_proxy_server/dune @@ -3,8 +3,7 @@ ; dependencies. (env - (static (flags (:standard -ccopt -static)) (ocamlopt_flags (:standard -O3))) - (release (ocamlopt_flags (:standard -O3)))) + (static (flags (:standard -ccopt -static)))) (executable (name main_proxy_server) diff --git a/src/bin_signer/dune b/src/bin_signer/dune index 983b7c8ea4c5..8528f6c04312 100644 --- a/src/bin_signer/dune +++ b/src/bin_signer/dune @@ -1,8 +1,6 @@ (env (static - (flags (:standard -ccopt -static -cclib "-lusb-1.0 -lhidapi-libusb -ludev")) - (ocamlopt_flags (:standard -O3))) - (release (ocamlopt_flags (:standard -O3)))) + (flags (:standard -ccopt -static -cclib "-lusb-1.0 -lhidapi-libusb -ludev")))) (executable (name main_signer) diff --git a/src/bin_snoop/dune b/src/bin_snoop/dune index 50f07cf6de35..f737757bb0ab 100644 --- a/src/bin_snoop/dune +++ b/src/bin_snoop/dune @@ -1,6 +1,5 @@ (env - (static (flags (:standard -ccopt -static)) (ocamlopt_flags (:standard -O3))) - (release (ocamlopt_flags (:standard -O3)))) + (static (flags (:standard -ccopt -static)))) (executable (name main_snoop) diff --git a/src/bin_validation/dune b/src/bin_validation/dune index 2325afda57bc..832641b492e2 100644 --- a/src/bin_validation/dune +++ b/src/bin_validation/dune @@ -1,5 +1,3 @@ -(env (release (ocamlopt_flags (:standard -O3)))) - (library (name tezos_validator) (public_name tezos-validator) diff --git a/src/lib_protocol_compiler/dune b/src/lib_protocol_compiler/dune index 82209a8600a9..e4e02d578a67 100644 --- a/src/lib_protocol_compiler/dune +++ b/src/lib_protocol_compiler/dune @@ -2,8 +2,7 @@ ; notice that the libraries are compiled with ; "\ -ccopt -static" is a temporary solution (env - (static (flags (:standard -ccopt -static)) (ocamlopt_flags (:standard -O3))) - (release (ocamlopt_flags (:standard -O3)))) + (static (flags (:standard -ccopt -static)))) (library (name tezos_protocol_registerer) diff --git a/src/proto_010_PtGRANAD/bin_accuser/dune b/src/proto_010_PtGRANAD/bin_accuser/dune index 4250095ec952..b744597f77ea 100644 --- a/src/proto_010_PtGRANAD/bin_accuser/dune +++ b/src/proto_010_PtGRANAD/bin_accuser/dune @@ -3,9 +3,7 @@ (static (flags (:standard -ccopt -static - -cclib "-lusb-1.0 -lhidapi-libusb -ludev")) - (ocamlopt_flags (:standard -O3))) - (release (ocamlopt_flags (:standard -O3)))) + -cclib "-lusb-1.0 -lhidapi-libusb -ludev")))) (executable (name main_accuser_010_PtGRANAD) diff --git a/src/proto_010_PtGRANAD/bin_baker/dune b/src/proto_010_PtGRANAD/bin_baker/dune index be7a5120d680..c4a977650edb 100644 --- a/src/proto_010_PtGRANAD/bin_baker/dune +++ b/src/proto_010_PtGRANAD/bin_baker/dune @@ -3,9 +3,7 @@ (static (flags (:standard -ccopt -static - -cclib "-lusb-1.0 -lhidapi-libusb -ludev")) - (ocamlopt_flags (:standard -O3))) - (release (ocamlopt_flags (:standard -O3)))) + -cclib "-lusb-1.0 -lhidapi-libusb -ludev")))) (executable (name main_baker_010_PtGRANAD) diff --git a/src/proto_010_PtGRANAD/bin_endorser/dune b/src/proto_010_PtGRANAD/bin_endorser/dune index c0b6473d17ca..8201ba78b384 100644 --- a/src/proto_010_PtGRANAD/bin_endorser/dune +++ b/src/proto_010_PtGRANAD/bin_endorser/dune @@ -3,9 +3,7 @@ (static (flags (:standard -ccopt -static - -cclib "-lusb-1.0 -lhidapi-libusb -ludev")) - (ocamlopt_flags (:standard -O3))) - (release (ocamlopt_flags (:standard -O3)))) + -cclib "-lusb-1.0 -lhidapi-libusb -ludev")))) (executable (name main_endorser_010_PtGRANAD) diff --git a/src/proto_011_PtHangz2/bin_accuser/dune b/src/proto_011_PtHangz2/bin_accuser/dune index 0d51fa4d14d2..50f1caf8ef4e 100644 --- a/src/proto_011_PtHangz2/bin_accuser/dune +++ b/src/proto_011_PtHangz2/bin_accuser/dune @@ -3,9 +3,7 @@ (static (flags (:standard -ccopt -static - -cclib "-lusb-1.0 -lhidapi-libusb -ludev")) - (ocamlopt_flags (:standard -O3))) - (release (ocamlopt_flags (:standard -O3)))) + -cclib "-lusb-1.0 -lhidapi-libusb -ludev")))) (executable (name main_accuser_011_PtHangz2) diff --git a/src/proto_011_PtHangz2/bin_baker/dune b/src/proto_011_PtHangz2/bin_baker/dune index 1ade92beb947..d578ca5283f9 100644 --- a/src/proto_011_PtHangz2/bin_baker/dune +++ b/src/proto_011_PtHangz2/bin_baker/dune @@ -3,9 +3,7 @@ (static (flags (:standard -ccopt -static - -cclib "-lusb-1.0 -lhidapi-libusb -ludev")) - (ocamlopt_flags (:standard -O3))) - (release (ocamlopt_flags (:standard -O3)))) + -cclib "-lusb-1.0 -lhidapi-libusb -ludev")))) (executable (name main_baker_011_PtHangz2) diff --git a/src/proto_011_PtHangz2/bin_endorser/dune b/src/proto_011_PtHangz2/bin_endorser/dune index d00bbcea86c4..f271804315c1 100644 --- a/src/proto_011_PtHangz2/bin_endorser/dune +++ b/src/proto_011_PtHangz2/bin_endorser/dune @@ -3,9 +3,7 @@ (static (flags (:standard -ccopt -static - -cclib "-lusb-1.0 -lhidapi-libusb -ludev")) - (ocamlopt_flags (:standard -O3))) - (release (ocamlopt_flags (:standard -O3)))) + -cclib "-lusb-1.0 -lhidapi-libusb -ludev")))) (executable (name main_endorser_011_PtHangz2) diff --git a/src/proto_alpha/bin_accuser/dune b/src/proto_alpha/bin_accuser/dune index d9129c88b5fb..520b4384a4ac 100644 --- a/src/proto_alpha/bin_accuser/dune +++ b/src/proto_alpha/bin_accuser/dune @@ -3,9 +3,7 @@ (static (flags (:standard -ccopt -static - -cclib "-lusb-1.0 -lhidapi-libusb -ludev")) - (ocamlopt_flags (:standard -O3))) - (release (ocamlopt_flags (:standard -O3)))) + -cclib "-lusb-1.0 -lhidapi-libusb -ludev")))) (executable (name main_accuser_alpha) diff --git a/src/proto_alpha/bin_baker/dune b/src/proto_alpha/bin_baker/dune index e1212af6c403..7db4bf1b9480 100644 --- a/src/proto_alpha/bin_baker/dune +++ b/src/proto_alpha/bin_baker/dune @@ -3,9 +3,7 @@ (static (flags (:standard -ccopt -static - -cclib "-lusb-1.0 -lhidapi-libusb -ludev")) - (ocamlopt_flags (:standard -O3))) - (release (ocamlopt_flags (:standard -O3)))) + -cclib "-lusb-1.0 -lhidapi-libusb -ludev")))) (executable (name main_baker_alpha) -- GitLab