Fix bench

dev/bench/bench.sh

@@ -138,8 +138,10 @@ number_of_processors=$(cat /proc/cpuinfo | grep '^processor *' | wc -l)
 program_name="$0"
 program_path=$(readlink -f "${program_name%/*}")
 
-# pre build needed helpers
-dune build --root "$program_path/../.." -- dev/bench/render_results.exe dev/bench/render_line_results.exe topbin/rocq.exe
+# pre build needed helpers (needs an opam switch)
+prebuild_helpers() {
+  dune build --root "$program_path/../.." -- dev/bench/render_results.exe dev/bench/render_line_results.exe topbin/rocq.exe
+}
 
 render_results=$(readlink -f "$program_path/../../_build/default/dev/bench/render_results.exe")
 render_line_results=$(readlink -f "$program_path/../../_build/default/dev/bench//render_line_results.exe")
@@ -438,6 +440,9 @@ create_opam "NEW" "$new_ocaml_version" "$new_coq_commit" "$new_coq_version" \
             "$new_coq_opam_archive_dir" "$new_opam_override_urls" "$new_ocaml_flambda"
 new_coq_commit_long="$COQ_HASH_LONG"
 
+# pre build needed helpers (needs an opam switch)
+prebuild_helpers
+
 # Create an OPAM-root to which we will install the OLD version of Coq.
 create_opam "OLD" "$old_ocaml_version" "$old_coq_commit" "$old_coq_version" \
             "$old_coq_opam_archive_dir" "$old_opam_override_urls" "$old_ocaml_flambda"
@@ -467,7 +472,7 @@ export PROFILING=1
 export COQ_PROFILE_COMPONENTS=command,parse_command,partac.perform
 
 # packages tied to the coq commit need to be pinned accordingly
-core_packages='rocq-runtime coq-core rocq-core coq-stdlib coqide-server coq'
+core_packages='rocq-runtime coq-core rocq-core rocq-stdlib coq-stdlib coqide-server rocq coq'
 
 for coq_opam_package in $core_packages $coq_opam_packages; do