Skip to content

Commit 812313a

Browse files
committed
Use universal darwin build for previous crystal
For last crystal releases there is only crystal-darwin-universal. It means, there is no need to separate on ARCH. Update `darwin/Makefile` to use folder name without arch suffix.
1 parent f2c1e13 commit 812313a

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

darwin/Makefile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ CRYSTAL_SHA1 ?= $(CRYSTAL_VERSION) ## Git tag/branch/sha1 to checkout and build
88
PACKAGE_ITERATION ?= 1
99
FORCE_GIT_TAGGED ?= 1 ## Require build to be based on git tag/branch
1010

11-
PREVIOUS_CRYSTAL_RELEASE_DARWIN_TARGZ ?= ## url to crystal-{version}-{package}-darwin-x86_64.tar.gz
11+
PREVIOUS_CRYSTAL_RELEASE_DARWIN_TARGZ ?= ## url to crystal-{version}-{package}-darwin-universal.tar.gz . Eg: https://github.com/crystal-lang/crystal/releases/download/1.10.1/crystal-1.10.1-1-darwin-universal.tar.gz
1212

1313
OUTPUT_DIR = build
1414

@@ -39,15 +39,15 @@ help: ## Show this help
3939
awk 'BEGIN {FS = "## "}; /^## [a-zA-Z_-]/ {printf " \033[36m%s\033[0m\n", $$2}; /^## / {printf " %s\n", $$2}'
4040

4141
.PHONY: darwin-previous
42-
darwin-previous: $(CURDIR)/../omnibus/crystal-darwin-x86_64/embedded/bin/crystal ## download previous crystal darwin release
42+
darwin-previous: $(CURDIR)/../omnibus/crystal-darwin/embedded/bin/crystal ## download previous crystal darwin release
4343

4444
# Once there are prior builds for arm64, this can use DARWIN_ARCH
45-
$(CURDIR)/../omnibus/crystal-darwin-x86_64/embedded/bin/crystal:
46-
curl -L -o /tmp/crystal-darwin-x86_64.tar.gz $(PREVIOUS_CRYSTAL_RELEASE_DARWIN_TARGZ) \
47-
&& mkdir -p $(CURDIR)/../omnibus/crystal-darwin-x86_64 \
48-
&& tar xfz /tmp/crystal-darwin-x86_64.tar.gz -C $(CURDIR)/../omnibus/crystal-darwin-x86_64 --strip-components=1 \
49-
&& rm /tmp/crystal-darwin-x86_64.tar.gz \
50-
&& chmod +x $(CURDIR)/../omnibus/crystal-darwin-x86_64/embedded/bin/crystal
45+
$(CURDIR)/../omnibus/crystal-darwin/embedded/bin/crystal:
46+
curl -L -o /tmp/crystal-darwin.tar.gz $(PREVIOUS_CRYSTAL_RELEASE_DARWIN_TARGZ) \
47+
&& mkdir -p $(CURDIR)/../omnibus/crystal-darwin \
48+
&& tar xfz /tmp/crystal-darwin.tar.gz -C $(CURDIR)/../omnibus/crystal-darwin --strip-components=1 \
49+
&& rm /tmp/crystal-darwin.tar.gz \
50+
&& chmod +x $(CURDIR)/../omnibus/crystal-darwin/embedded/bin/crystal
5151

5252
$(OUTPUT_DIR)/$(DARWIN_NAME) $(OUTPUT_DIR)/$(DARWIN_PKG_NAME): ## Build omnibus crystal project
5353
ifeq ($(FORCE_GIT_TAGGED), 0)

0 commit comments

Comments
 (0)