Skip to content

Commit ff09ad1

Browse files
committed
Fixed tool flavor detection for 32-bits systems
Fixes #20 Fixes #25
1 parent 00cd832 commit ff09ad1

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

Diff for: arduino/cores/tools.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -163,17 +163,17 @@ func (f *Flavour) isCompatibleWith(osName, osArch string) bool {
163163
return regexpArmLinux.MatchString(f.OS)
164164
case "linux,amd64":
165165
return regexpAmd64.MatchString(f.OS)
166-
case "linux,i386":
166+
case "linux,386":
167167
return regexpi386.MatchString(f.OS)
168-
case "windows,i386", "windows,amd64":
168+
case "windows,386", "windows,amd64":
169169
return regexpWindows.MatchString(f.OS)
170170
case "darwin,amd64":
171171
return regexpmac32Bit.MatchString(f.OS) || regexpMac64Bit.MatchString(f.OS)
172-
case "darwin,i386":
172+
case "darwin,386":
173173
return regexpmac32Bit.MatchString(f.OS)
174174
case "freebsd,arm":
175175
return regexpArmBSD.MatchString(f.OS)
176-
case "freebsd,i386", "freebsd,amd64":
176+
case "freebsd,386", "freebsd,amd64":
177177
genericFreeBSDexp := regexp.MustCompile(osArch + "%s-freebsd[0-9]*")
178178
return genericFreeBSDexp.MatchString(f.OS)
179179
}

Diff for: arduino/cores/tools_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ func TestFlavorCompatibility(t *testing.T) {
2828
Os string
2929
Arch string
3030
}
31-
windowsi386 := &os{"windows", "i386"}
31+
windowsi386 := &os{"windows", "386"}
3232
windowsx8664 := &os{"windows", "amd64"}
33-
linuxi386 := &os{"linux", "i386"}
33+
linuxi386 := &os{"linux", "386"}
3434
linuxamd64 := &os{"linux", "amd64"}
3535
linuxarm := &os{"linux", "arm"}
3636
linuxarmbe := &os{"linux", "armbe"}
37-
darwini386 := &os{"darwin", "i386"}
37+
darwini386 := &os{"darwin", "386"}
3838
darwinamd646 := &os{"darwin", "amd64"}
39-
freebsdi386 := &os{"freebsd", "i386"}
39+
freebsdi386 := &os{"freebsd", "386"}
4040
freebsdamd64 := &os{"freebsd", "amd64"}
4141
oses := []*os{
4242
windowsi386,

0 commit comments

Comments
 (0)