Build barretenberg's primitives.wasm

AztecProtocol · Apr 6, 2023 · b72a5ac · b72a5ac
1 parent 2d4873c
commit b72a5ac
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/cpp/barretenberg b/cpp/barretenberg
diff --git a/cpp/cmake/barretenberg.cmake b/cpp/cmake/barretenberg.cmake
@@ -12,8 +12,10 @@ include(ExternalProject)
 # Reference barretenberg artifacts (like library archives) via this dir:
 if (WASM)
     set(BBERG_BUILD_DIR ${BBERG_DIR}/build-wasm)
+    set(BBERG_TARGETS --target barretenberg --target env --target primitives.wasm)
 else()
     set(BBERG_BUILD_DIR ${BBERG_DIR}/build)
+    set(BBERG_TARGETS --target barretenberg --target env)
 endif()
 
 if(NOT CMAKE_BBERG_PRESET)
@@ -32,7 +34,7 @@ ExternalProject_Add(Barretenberg
     UPDATE_COMMAND ""
     INSTALL_COMMAND ""
     CONFIGURE_COMMAND ${CMAKE_COMMAND} --preset ${CMAKE_BBERG_PRESET} -DSERIALIZE_CANARY=${SERIALIZE_CANARY} -DENABLE_ASAN=${ENABLE_ASAN} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-    BUILD_COMMAND ${CMAKE_COMMAND} --build --preset ${CMAKE_BBERG_PRESET} --target barretenberg --target env
+    BUILD_COMMAND ${CMAKE_COMMAND} --build --preset ${CMAKE_BBERG_PRESET} ${BBERG_TARGETS}
     # byproducts needed by ninja generator (not needed by make)
     BUILD_BYPRODUCTS ${BBERG_BUILD_DIR}/lib/libbarretenberg.a ${BBERG_BUILD_DIR}/lib/libenv.a)
 

diff --git a/cpp/dockerfiles/Dockerfile.wasm-linux-clang b/cpp/dockerfiles/Dockerfile.wasm-linux-clang
@@ -8,4 +8,5 @@ RUN cmake --preset wasm && cmake --build --preset wasm
 
 FROM alpine:3.17
 COPY --from=builder /usr/src/aztec3-circuits/cpp/build-wasm/bin/aztec3-circuits.wasm /usr/src/aztec3-circuits/cpp/build-wasm/bin/aztec3-circuits.wasm
+COPY --from=builder /usr/src/aztec3-circuits/cpp/barretenberg/cpp/build-wasm/bin/primitives.wasm /usr/src/aztec3-circuits/cpp/barretenberg/cpp/build-wasm/bin/primitives.wasm
 COPY --from=builder /usr/src/aztec3-circuits/cpp/barretenberg/cpp/srs_db /usr/src/aztec3-circuits/cpp/barretenberg/cpp/srs_db
+3 −2		cpp/dockerfiles/Dockerfile.wasm-linux-clang
+31 −0		cpp/src/CMakeLists.txt
+20 −1		cpp/src/barretenberg/stdlib/primitives/bool/bool.test.cpp
+97 −3		cpp/src/barretenberg/stdlib/primitives/field/array.test.cpp