Skip to content

Commit 2a5af7a

Browse files
authored
fix: disable AVM in bb merge train again (#18118) I
1 parent 3cc224e commit 2a5af7a

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

barretenberg/cpp/src/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,8 @@ add_subdirectory(barretenberg/wasi)
113113
add_subdirectory(barretenberg/world_state)
114114
add_subdirectory(barretenberg/lmdblib)
115115

116-
if(AVM)
116+
# NOTE: Do not conditionally base this on the AVM flag as it defines a necessary vm2_sim library.
117+
if(NOT WASM)
117118
add_subdirectory(barretenberg/vm2)
118119
if(FUZZING)
119120
add_subdirectory(barretenberg/avm_fuzzer)

bootstrap.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -481,6 +481,7 @@ case "$cmd" in
481481
"ci-barretenberg")
482482
export CI=1
483483
export USE_TEST_CACHE=1
484+
export AVM=0
484485
export AVM_TRANSPILER=0
485486
barretenberg/cpp/bootstrap.sh ci
486487
;;

0 commit comments

Comments
 (0)