Skip to content

Commit

Permalink
fix: bb mac build (#7619)
Browse files Browse the repository at this point in the history
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
```
  • Loading branch information
just-mitch authored Jul 25, 2024
1 parent 9dd9195 commit e3c5602
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 7 deletions.
2 changes: 0 additions & 2 deletions barretenberg/cpp/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -127,7 +126,6 @@ set(BARRETENBERG_TARGET_OBJECTS
$<TARGET_OBJECTS:simple_example_objects>
$<TARGET_OBJECTS:flavor_objects>
$<TARGET_OBJECTS:goblin_objects>
$<TARGET_OBJECTS:honk_objects>
$<TARGET_OBJECTS:numeric_objects>
$<TARGET_OBJECTS:plonk_objects>
$<TARGET_OBJECTS:plonk_honk_shared_objects>
Expand Down
2 changes: 1 addition & 1 deletion barretenberg/cpp/src/barretenberg/bb/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<size_t>(static_cast<uint256_t>(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]);
Expand Down
2 changes: 1 addition & 1 deletion barretenberg/cpp/src/barretenberg/eccvm/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
barretenberg_module(eccvm honk sumcheck)
barretenberg_module(eccvm sumcheck)
Original file line number Diff line number Diff line change
@@ -1 +1 @@
barretenberg_module(translator_vm honk sumcheck)
barretenberg_module(translator_vm sumcheck)
Original file line number Diff line number Diff line change
@@ -1 +1 @@
barretenberg_module(ultra_honk honk sumcheck)
barretenberg_module(ultra_honk sumcheck)
2 changes: 1 addition & 1 deletion barretenberg/cpp/src/barretenberg/vm/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
if(NOT DISABLE_AZTEC_VM)
barretenberg_module(vm honk sumcheck)
barretenberg_module(vm sumcheck)
endif()

0 comments on commit e3c5602

Please sign in to comment.