Skip to content

Commit d49dd8b

Browse files
committed
chore: serialize ipc generation targets
1 parent 145d926 commit d49dd8b

2 files changed

Lines changed: 10 additions & 8 deletions

File tree

Makefile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -156,19 +156,19 @@ bb-cpp-cross-arm64-macos-objects: bb-cpp-yarn
156156
$(call build,$@,barretenberg/cpp,build_cross_objects arm64-macos)
157157

158158
# Cross-compile for ARM64 Linux (release only)
159-
bb-cpp-cross-arm64-linux: bb-cpp-cross-arm64-linux-objects avm-transpiler-cross-arm64-linux bb-cpp-yarn
159+
bb-cpp-cross-arm64-linux: bb-cpp-native bb-cpp-cross-arm64-linux-objects avm-transpiler-cross-arm64-linux bb-cpp-yarn
160160
$(call build,$@,barretenberg/cpp,build_preset arm64-linux)
161161

162162
# Cross-compile for AMD64 macOS (release only)
163-
bb-cpp-cross-amd64-macos: bb-cpp-cross-amd64-macos-objects avm-transpiler-cross-amd64-macos bb-cpp-yarn
163+
bb-cpp-cross-amd64-macos: bb-cpp-cross-arm64-linux bb-cpp-cross-amd64-macos-objects avm-transpiler-cross-amd64-macos bb-cpp-yarn
164164
$(call build,$@,barretenberg/cpp,build_preset amd64-macos)
165165

166166
# Cross-compile for ARM64 macOS (release or CI_FULL)
167-
bb-cpp-cross-arm64-macos: bb-cpp-cross-arm64-macos-objects avm-transpiler-cross-arm64-macos bb-cpp-yarn
167+
bb-cpp-cross-arm64-macos: bb-cpp-cross-amd64-macos bb-cpp-cross-arm64-macos-objects avm-transpiler-cross-arm64-macos bb-cpp-yarn
168168
$(call build,$@,barretenberg/cpp,build_preset arm64-macos)
169169

170170
# Cross-compile for AMD64 Windows (release only)
171-
bb-cpp-cross-amd64-windows: avm-transpiler-cross-amd64-windows
171+
bb-cpp-cross-amd64-windows: bb-cpp-cross-arm64-macos avm-transpiler-cross-amd64-windows
172172
$(call build,$@,barretenberg/cpp,build_preset amd64-windows)
173173

174174
# iOS SDK download (shared by all iOS cross-compile targets)
@@ -180,19 +180,19 @@ bb-cpp-android-sysroot:
180180
$(call run_command,$@,$(ROOT)/barretenberg/cpp,bash scripts/download-android-sysroot.sh)
181181

182182
# Cross-compile for ARM64 iOS (release only, static lib only)
183-
bb-cpp-cross-arm64-ios: bb-cpp-ios-sdk
183+
bb-cpp-cross-arm64-ios: bb-cpp-cross-amd64-windows bb-cpp-ios-sdk
184184
$(call build,$@,barretenberg/cpp,build_preset arm64-ios)
185185

186186
# Cross-compile for ARM64 iOS Simulator (release only, static lib only)
187-
bb-cpp-cross-arm64-ios-sim: bb-cpp-ios-sdk
187+
bb-cpp-cross-arm64-ios-sim: bb-cpp-cross-arm64-ios bb-cpp-ios-sdk
188188
$(call build,$@,barretenberg/cpp,build_preset arm64-ios-sim)
189189

190190
# Cross-compile for ARM64 Android (release only, static lib only)
191-
bb-cpp-cross-arm64-android: bb-cpp-android-sysroot
191+
bb-cpp-cross-arm64-android: bb-cpp-cross-arm64-ios-sim bb-cpp-android-sysroot
192192
$(call build,$@,barretenberg/cpp,build_preset arm64-android)
193193

194194
# Cross-compile for x86_64 Android (release only, static lib only)
195-
bb-cpp-cross-x86_64-android: bb-cpp-android-sysroot
195+
bb-cpp-cross-x86_64-android: bb-cpp-cross-arm64-android bb-cpp-android-sysroot
196196
$(call build,$@,barretenberg/cpp,build_preset x86_64-android)
197197

198198
bb-cpp-cross: bb-cpp-cross-arm64-linux bb-cpp-cross-amd64-macos bb-cpp-cross-arm64-macos bb-cpp-cross-amd64-windows bb-cpp-cross-arm64-ios bb-cpp-cross-arm64-ios-sim bb-cpp-cross-arm64-android bb-cpp-cross-x86_64-android

barretenberg/cpp/.rebuild_patterns

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@
66
^barretenberg/cpp/scripts/
77
^barretenberg/cpp/bootstrap.sh
88
^barretenberg/cpp/CMakePresets.json
9+
^ipc-codegen/src/.*\.ts$
10+
^ipc-codegen/templates/cpp/

0 commit comments

Comments
 (0)