diff --git a/CHANGELOG.md b/CHANGELOG.md index 988418a8af..5a1f56af57 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ #### Upcoming Changes +* chore: Unify deps makefile target [#2211](https://github.com/lambdaclass/cairo-vm/pull/2211) + * Fix bug affecting cairo1 programs with input and System builtin [#2207](https://github.com/lambdaclass/cairo-vm/pull/2207) * chore: Pin generic-array version to 0.14.7 or lower. [#2227](https://github.com/lambdaclass/cairo-vm/pull/2227) diff --git a/Makefile b/Makefile index 7f08f1c2a2..baa853818b 100644 --- a/Makefile +++ b/Makefile @@ -13,8 +13,10 @@ ifndef PROPTEST_CASES export PROPTEST_CASES endif +UNAME := $(shell uname) + .PHONY: build-cairo-1-compiler build-cairo-1-compiler-macos build-cairo-2-compiler build-cairo-2-compiler-macos \ - deps deps-macos cargo-deps build run check test clippy coverage benchmark flamegraph\ + deps deps-macos deps-linux cargo-deps build run check test clippy coverage benchmark flamegraph\ compare_benchmarks_deps compare_benchmarks docs clean \ compare_trace_memory compare_trace compare_memory compare_pie compare_all_no_proof \ 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: cairo1-run-deps: cd cairo1-run; make deps -deps: create-proof-programs-symlinks cargo-deps build-cairo-1-compiler build-cairo-2-compiler cairo1-run-deps python-deps ; +deps: +ifeq ($(UNAME), Linux) +deps: deps-linux +endif +ifeq ($(UNAME), Darwin) +deps: deps-macos +endif + +deps-linux: create-proof-programs-symlinks cargo-deps build-cairo-1-compiler build-cairo-2-compiler cairo1-run-deps python-deps ; python-deps: uv python install 3.9.15 ; \ diff --git a/README.md b/README.md index d701bad50a..f2d8e72894 100644 --- a/README.md +++ b/README.md @@ -101,7 +101,7 @@ You can install all of the required and optional dependencies by running the scr In order to compile programs you need to install the cairo-lang package. -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. +Running the `make deps` command will create a virtual environment with all the required dependencies. You can then activate this environment by running ```bash