@@ -24,7 +24,7 @@ import (
24
24
"github.com/arduino/arduino-cli/arduino/resources"
25
25
"github.com/arduino/go-paths-helper"
26
26
properties "github.com/arduino/go-properties-orderedmap"
27
- "go.bug.st/relaxed-semver"
27
+ semver "go.bug.st/relaxed-semver"
28
28
)
29
29
30
30
// Tool represents a single Tool, part of a Package.
@@ -141,13 +141,14 @@ func (tr *ToolRelease) RuntimeProperties() *properties.Map {
141
141
}
142
142
143
143
var (
144
- regexpArmLinux = regexp .MustCompile ("arm.*-linux-gnueabihf" )
145
- regexpAmd64 = regexp .MustCompile ("x86_64-.*linux-gnu" )
146
- regexpi386 = regexp .MustCompile ("i[3456]86-.*linux-gnu" )
147
- regexpWindows = regexp .MustCompile ("i[3456]86-.*(mingw32|cygwin)" )
148
- regexpMac64Bit = regexp .MustCompile ("(i[3456]86|x86_64)-apple-darwin.*" )
149
- regexpmac32Bit = regexp .MustCompile ("i[3456]86-apple-darwin.*" )
150
- regexpArmBSD = regexp .MustCompile ("arm.*-freebsd[0-9]*" )
144
+ regexpArmLinux = regexp .MustCompile ("arm.*-linux-gnueabihf" )
145
+ regexpArm64Linux = regexp .MustCompile ("(aarch64|arm64)-linux-gnu" )
146
+ regexpAmd64 = regexp .MustCompile ("x86_64-.*linux-gnu" )
147
+ regexpi386 = regexp .MustCompile ("i[3456]86-.*linux-gnu" )
148
+ regexpWindows = regexp .MustCompile ("i[3456]86-.*(mingw32|cygwin)" )
149
+ regexpMac64Bit = regexp .MustCompile ("(i[3456]86|x86_64)-apple-darwin.*" )
150
+ regexpmac32Bit = regexp .MustCompile ("i[3456]86-apple-darwin.*" )
151
+ regexpArmBSD = regexp .MustCompile ("arm.*-freebsd[0-9]*" )
151
152
)
152
153
153
154
func (f * Flavor ) isCompatibleWithCurrentMachine () bool {
@@ -162,6 +163,8 @@ func (f *Flavor) isCompatibleWith(osName, osArch string) bool {
162
163
switch osName + "," + osArch {
163
164
case "linux,arm" , "linux,armbe" :
164
165
return regexpArmLinux .MatchString (f .OS )
166
+ case "linux,arm64" :
167
+ return regexpArm64Linux .MatchString (f .OS )
165
168
case "linux,amd64" :
166
169
return regexpAmd64 .MatchString (f .OS )
167
170
case "linux,386" :
0 commit comments