Skip to content

Commit

Permalink
fix(distribution): Fix architecture detection for ARMv7
Browse files Browse the repository at this point in the history
The patterns were incorrectly matching the the OS for ARMv7 builds which have extra chacters
indicating platform support.

Fixes: #17450

Signed-off-by: Jesse Szwedko <jesse.szwedko@datadoghq.com>
  • Loading branch information
jszwedko committed May 24, 2023
1 parent 58d7f3d commit dd22877
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions distribution/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ install_from_archive() {
assert_nz "$_arch" "arch"

local _archive_arch=""

case "$_arch" in
x86_64-apple-darwin)
_archive_arch=$_arch
Expand All @@ -152,13 +153,13 @@ install_from_archive() {
aarch64-*linux*)
_archive_arch="aarch64-unknown-linux-musl"
;;
armv7-*linux*-gnu)
armv7-*linux*-gnueabihf)
_archive_arch="armv7-unknown-linux-gnueabihf"
;;
armv7-*linux*-musl)
armv7-*linux*-musleabihf)
_archive_arch="armv7-unknown-linux-musleabihf"
;;
*)
*)
err "unsupported arch: $_arch"
;;
esac
Expand Down

0 comments on commit dd22877

Please sign in to comment.