Skip to content

Commit fd10e69

Browse files
chore: Install script supports Apple ARM with Rosetta (vectordotdev#18016)
Adds support to the install script for installing x86 builds of Vector on aarch64-apple-darwin when Rosetta is installed.
1 parent 115bd7b commit fd10e69

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

.github/actions/spelling/expect.txt

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
abcd
22
abcdefghijklm
33
abcdefghijklmnopqrstuvwxyzand
4-
abced
54
abortable
6-
acb
75
ack'ing
86
acking
97
Acq
@@ -37,7 +35,6 @@ ARNOTAREALIDD
3735
arshiyasolei
3836
asdf
3937
asdfasdf
40-
ASMS
4138
assertverify
4239
Asterix
4340
asynk
@@ -140,7 +137,6 @@ casttype
140137
castvalue
141138
cbe
142139
CBOR
143-
cbs
144140
cddl
145141
cdeab
146142
cdylib
@@ -304,7 +300,6 @@ ebfcee
304300
edenhill
305301
edns
306302
eeyun
307-
efg
308303
efgh
309304
Elhage
310305
emca
@@ -325,7 +320,6 @@ ENVARS
325320
envsubst
326321
EOIG
327322
EOL'ed
328-
Erfxl
329323
Err'ing
330324
errorf
331325
Errorsfor
@@ -469,7 +463,6 @@ hannes
469463
Hashbang
470464
hashbrown
471465
hashindex
472-
hashlink
473466
hashring
474467
hashset
475468
hashsum
@@ -778,6 +771,7 @@ NQTP
778771
nresamples
779772
nullishness
780773
numbackends
774+
oahd
781775
oap
782776
OKD
783777
omfwd
@@ -821,6 +815,7 @@ pathgen
821815
peekable
822816
PEMS
823817
pgmajfault
818+
pgrep
824819
PII
825820
Pitbull
826821
pkc
@@ -1053,7 +1048,6 @@ supertrait
10531048
suser
10541049
sustainability
10551050
svalue
1056-
Sya
10571051
sysfs
10581052
sysinit
10591053
syslogng
@@ -1114,7 +1108,6 @@ Tomola
11141108
tonydanza
11151109
toolbars
11161110
toolchains
1117-
TOOLSDIRECTORY
11181111
toolset
11191112
toor
11201113
topdir

distribution/install.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,16 @@ install_from_archive() {
152152
x86_64-*linux*-musl)
153153
_archive_arch="x86_64-unknown-linux-musl"
154154
;;
155+
aarch64-apple-darwin)
156+
# This if statement can be removed when Vector publishes aarch64-apple-darwin builds
157+
if /usr/bin/pgrep oahd >/dev/null 2>&1; then
158+
echo "Rosetta is installed, installing x86_64-apple-darwin archive"
159+
_archive_arch="x86_64-apple-darwin"
160+
else
161+
echo "Builds for Apple Silicon are not published today, please install Rosetta"
162+
err "unsupported arch: $_arch"
163+
fi
164+
;;
155165
aarch64-*linux*)
156166
_archive_arch="aarch64-unknown-linux-musl"
157167
;;

0 commit comments

Comments
 (0)