Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix cairo1 & cairo2 builds in Makefile #1390

Merged
merged 7 commits into from
Aug 22, 2023
Merged

Fix cairo1 & cairo2 builds in Makefile #1390

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7c76701
Remove cairo1 & cairo2 folders in `clean` makefile target
fmoletta Aug 18, 2023
8fbda11
Use conditionals to install cairo2
fmoletta Aug 18, 2023
15c9e73
Use conditionals to install cairo1
fmoletta Aug 18, 2023
4ebe42e
Fix name used
fmoletta Aug 18, 2023
10bc8eb
Use CAIRO_1_VERSION constant
fmoletta Aug 18, 2023
20625b0
Fix syntax
fmoletta Aug 18, 2023
fd4ba3a
Fix typo
fmoletta Aug 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 32 additions & 32 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,22 +115,22 @@ $(CAIRO_1_CONTRACTS_TEST_DIR)/%.casm: $(CAIRO_1_CONTRACTS_TEST_DIR)/%.sierra
# Setup Cairo 1 Compiler
# ======================

cairo-repo-1-dir = cairo1
cairo-repo-1-dir-macos = cairo1-macos

build-cairo-1-compiler-macos: | $(cairo-repo-1-dir-macos)

$(cairo-repo-1-dir-macos):
curl -L -o cairo-1.1.1.tar https://github.com/starkware-libs/cairo/releases/download/v1.1.1/release-aarch64-apple-darwin.tar \
&& tar -xzvf cairo-1.1.1.tar \
&& mv cairo/ cairo1/

build-cairo-1-compiler: | $(cairo-repo-1-dir)

$(cairo-repo-1-dir):
curl -L -o cairo-1.1.1.tar https://github.com/starkware-libs/cairo/releases/download/v1.1.1/release-x86_64-unknown-linux-musl.tar.gz \
&& tar -xzvf cairo-1.1.1.tar \
&& mv cairo/ cairo1/
CAIRO_1_REPO_DIR = cairo1
CAIRO_1_VERSION = 1.1.1

build-cairo-1-compiler-macos:
@if [ ! -d "$(CAIRO_1_REPO_DIR)" ]; then \
curl -L -o cairo-$(CAIRO_1_VERSION).tar https://github.com/starkware-libs/cairo/releases/download/v$(CAIRO_1_VERSION)/release-aarch64-apple-darwin.tar \
&& tar -xzvf cairo-$(CAIRO_1_VERSION).tar \
&& mv cairo/ cairo1/; \
fi

build-cairo-1-compiler:
@if [ ! -d "$(CAIRO_1_REPO_DIR)" ]; then \
curl -L -o cairo-$(CAIRO_1_VERSION).tar https://github.com/starkware-libs/cairo/releases/download/v$(CAIRO_1_VERSION)/release-x86_64-unknown-linux-musl.tar.gz \
&& tar -xzvf cairo-$(CAIRO_1_VERSION).tar \
&& mv cairo/ cairo1/; \
fi

# ======================
# Test Cairo 2 Contracts
Expand All @@ -152,24 +152,22 @@ $(CAIRO_2_CONTRACTS_TEST_DIR)/%.casm: $(CAIRO_2_CONTRACTS_TEST_DIR)/%.sierra
# Setup Cairo 2 Compiler
# ======================

cairo-repo-2-dir = cairo2
cairo-repo-2-dir-macos = cairo2-macos

build-cairo-2-compiler-macos: | $(cairo-repo-2-dir-macos)

CAIRO_2_VERSION=2.1.0-rc1

$(cairo-repo-2-dir-macos):
curl -L -o cairo-${CAIRO_2_VERSION}.tar https://github.com/starkware-libs/cairo/releases/download/v${CAIRO_2_VERSION}/release-aarch64-apple-darwin.tar \
&& tar -xzvf cairo-${CAIRO_2_VERSION}.tar \
&& mv cairo/ cairo2/
CAIRO_2_REPO_DIR = cairo2
CAIRO_2_VERSION = 2.1.0-rc1

build-cairo-2-compiler: | $(cairo-repo-2-dir)
build-cairo-2-compiler-macos:
@if [ ! -d "$(CAIRO_2_REPO_DIR)" ]; then \
curl -L -o cairo-${CAIRO_2_VERSION}.tar https://github.com/starkware-libs/cairo/releases/download/v${CAIRO_2_VERSION}/release-aarch64-apple-darwin.tar \
&& tar -xzvf cairo-${CAIRO_2_VERSION}.tar \
&& mv cairo/ cairo2/; \
fi

$(cairo-repo-2-dir):
curl -L -o cairo-${CAIRO_2_VERSION}.tar https://github.com/starkware-libs/cairo/releases/download/v${CAIRO_2_VERSION}/release-x86_64-unknown-linux-musl.tar.gz \
&& tar -xzvf cairo-${CAIRO_2_VERSION}.tar \
&& mv cairo/ cairo2/
build-cairo-2-compiler:
@if [ ! -d "$(CAIRO_2_REPO_DIR)" ]; then \
curl -L -o cairo-${CAIRO_2_VERSION}.tar https://github.com/starkware-libs/cairo/releases/download/v${CAIRO_2_VERSION}/release-x86_64-unknown-linux-musl.tar.gz \
&& tar -xzvf cairo-${CAIRO_2_VERSION}.tar \
&& mv cairo/ cairo2/; \
fi

cargo-deps:
cargo install --version 0.3.1 iai-callgrind-runner
Expand Down Expand Up @@ -303,6 +301,8 @@ clean:
rm -rf cairo-vm-env
rm -rf cairo-vm-pypy-env
rm -rf cairo
rm -rf cairo1
rm -rf cairo2

fuzzer-deps:
cargo +nightly install cargo-fuzz
Expand Down