Skip to content

Commit 7b32c3e

Browse files
Unify deps makefile target (#2211)
* Unify deps makefile target * Update changelog * Remove deps-macos mention in README --------- Co-authored-by: Gabriel Bosio <[email protected]>
1 parent 2f8c8a0 commit 7b32c3e

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
#### Upcoming Changes
44

5+
* chore: Unify deps makefile target [#2211](https://github.com/lambdaclass/cairo-vm/pull/2211)
6+
57
* Fix bug affecting cairo1 programs with input and System builtin [#2207](https://github.com/lambdaclass/cairo-vm/pull/2207)
68

79
* chore: Pin generic-array version to 0.14.7 or lower. [#2227](https://github.com/lambdaclass/cairo-vm/pull/2227)

Makefile

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@ ifndef PROPTEST_CASES
1313
export PROPTEST_CASES
1414
endif
1515

16+
UNAME := $(shell uname)
17+
1618
.PHONY: build-cairo-1-compiler build-cairo-1-compiler-macos build-cairo-2-compiler build-cairo-2-compiler-macos \
17-
deps deps-macos cargo-deps build run check test clippy coverage benchmark flamegraph\
19+
deps deps-macos deps-linux cargo-deps build run check test clippy coverage benchmark flamegraph\
1820
compare_benchmarks_deps compare_benchmarks docs clean \
1921
compare_trace_memory compare_trace compare_memory compare_pie compare_all_no_proof \
2022
compare_trace_memory_proof compare_all_proof compare_trace_proof compare_memory_proof compare_air_public_input compare_air_private_input\
@@ -233,7 +235,15 @@ cargo-deps:
233235
cairo1-run-deps:
234236
cd cairo1-run; make deps
235237

236-
deps: create-proof-programs-symlinks cargo-deps build-cairo-1-compiler build-cairo-2-compiler cairo1-run-deps python-deps ;
238+
deps:
239+
ifeq ($(UNAME), Linux)
240+
deps: deps-linux
241+
endif
242+
ifeq ($(UNAME), Darwin)
243+
deps: deps-macos
244+
endif
245+
246+
deps-linux: create-proof-programs-symlinks cargo-deps build-cairo-1-compiler build-cairo-2-compiler cairo1-run-deps python-deps ;
237247

238248
python-deps:
239249
uv python install 3.9.15 ; \

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ You can install all of the required and optional dependencies by running the scr
101101

102102
In order to compile programs you need to install the cairo-lang package.
103103

104-
Running the `make deps` (or the `make deps-macos` if you are runnning in MacOS) command will create a virtual environment with all the required dependencies.
104+
Running the `make deps` command will create a virtual environment with all the required dependencies.
105105

106106
You can then activate this environment by running
107107
```bash

0 commit comments

Comments
 (0)