From e3c560216e1bce7d22e30ef18d428f1ab7335a09 Mon Sep 17 00:00:00 2001 From: just-mitch <68168980+just-mitch@users.noreply.github.com> Date: Thu, 25 Jul 2024 15:30:48 -0400 Subject: [PATCH] fix: bb mac build (#7619) no forced c-style casting honk no longer needed as an explicit cmake target object RE the second point: inside barretenberg/honk, the only .cpp file is `testing.cpp`, with contents: ``` #include "testing.hpp" // Adding this file so that an object file is created. Otherwise CMake configure complains ``` --- barretenberg/cpp/src/CMakeLists.txt | 2 -- barretenberg/cpp/src/barretenberg/bb/main.cpp | 2 +- barretenberg/cpp/src/barretenberg/eccvm/CMakeLists.txt | 2 +- barretenberg/cpp/src/barretenberg/translator_vm/CMakeLists.txt | 2 +- barretenberg/cpp/src/barretenberg/ultra_honk/CMakeLists.txt | 2 +- barretenberg/cpp/src/barretenberg/vm/CMakeLists.txt | 2 +- 6 files changed, 5 insertions(+), 7 deletions(-) diff --git a/barretenberg/cpp/src/CMakeLists.txt b/barretenberg/cpp/src/CMakeLists.txt index 077d20a4c3b..3c1dee8a29a 100644 --- a/barretenberg/cpp/src/CMakeLists.txt +++ b/barretenberg/cpp/src/CMakeLists.txt @@ -69,7 +69,6 @@ add_subdirectory(barretenberg/examples) add_subdirectory(barretenberg/flavor) add_subdirectory(barretenberg/goblin) add_subdirectory(barretenberg/grumpkin_srs_gen) -add_subdirectory(barretenberg/honk) add_subdirectory(barretenberg/numeric) add_subdirectory(barretenberg/plonk) add_subdirectory(barretenberg/plonk_honk_shared) @@ -127,7 +126,6 @@ set(BARRETENBERG_TARGET_OBJECTS $ $ $ - $ $ $ $ diff --git a/barretenberg/cpp/src/barretenberg/bb/main.cpp b/barretenberg/cpp/src/barretenberg/bb/main.cpp index 8475743aef0..7ad6d7213aa 100644 --- a/barretenberg/cpp/src/barretenberg/bb/main.cpp +++ b/barretenberg/cpp/src/barretenberg/bb/main.cpp @@ -572,7 +572,7 @@ void prove_tube(const std::string& output_path) // TODO(https://github.com/AztecProtocol/barretenberg/issues/1048): INSECURE - make this tube proof actually use // these public inputs by turning proof into witnesses and call // set_public on each witness - auto num_public_inputs = (size_t)proof.folding_proof[1]; + auto num_public_inputs = static_cast(static_cast(proof.folding_proof[1])); for (size_t i = 0; i < num_public_inputs; i++) { // We offset 3 builder->add_public_variable(proof.folding_proof[i + 3]); diff --git a/barretenberg/cpp/src/barretenberg/eccvm/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/eccvm/CMakeLists.txt index b5b480745e7..55caefab48f 100644 --- a/barretenberg/cpp/src/barretenberg/eccvm/CMakeLists.txt +++ b/barretenberg/cpp/src/barretenberg/eccvm/CMakeLists.txt @@ -1 +1 @@ -barretenberg_module(eccvm honk sumcheck) \ No newline at end of file +barretenberg_module(eccvm sumcheck) \ No newline at end of file diff --git a/barretenberg/cpp/src/barretenberg/translator_vm/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/translator_vm/CMakeLists.txt index c5740c436fc..74967d50486 100644 --- a/barretenberg/cpp/src/barretenberg/translator_vm/CMakeLists.txt +++ b/barretenberg/cpp/src/barretenberg/translator_vm/CMakeLists.txt @@ -1 +1 @@ -barretenberg_module(translator_vm honk sumcheck) \ No newline at end of file +barretenberg_module(translator_vm sumcheck) \ No newline at end of file diff --git a/barretenberg/cpp/src/barretenberg/ultra_honk/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/ultra_honk/CMakeLists.txt index 0d53934bbad..7c55050a138 100644 --- a/barretenberg/cpp/src/barretenberg/ultra_honk/CMakeLists.txt +++ b/barretenberg/cpp/src/barretenberg/ultra_honk/CMakeLists.txt @@ -1 +1 @@ -barretenberg_module(ultra_honk honk sumcheck) \ No newline at end of file +barretenberg_module(ultra_honk sumcheck) \ No newline at end of file diff --git a/barretenberg/cpp/src/barretenberg/vm/CMakeLists.txt b/barretenberg/cpp/src/barretenberg/vm/CMakeLists.txt index 28052bf9656..fc3a02d77dc 100644 --- a/barretenberg/cpp/src/barretenberg/vm/CMakeLists.txt +++ b/barretenberg/cpp/src/barretenberg/vm/CMakeLists.txt @@ -1,3 +1,3 @@ if(NOT DISABLE_AZTEC_VM) - barretenberg_module(vm honk sumcheck) + barretenberg_module(vm sumcheck) endif() \ No newline at end of file