diff options
| author | dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> | 2020-08-18 19:42:25 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-18 19:42:25 +0300 |
| commit | b0062ae1dad54c401033e41d7ad98326d58fd32c (patch) | |
| tree | f9c56844ffa403e4378c08183505be22242d8385 /eng/common/cross/toolchain.cmake | |
| parent | f9dfc8a29e9ae0d2388e6fcad8b7f823f9c09e9e (diff) | |
Update dependencies from https://github.com/dotnet/arcade build 20200817.6 (#1436)
[master] Update dependencies from dotnet/arcade
- Updates:
- Microsoft.DotNet.Arcade.Sdk: from 5.0.0-beta.20411.8 to 5.0.0-beta.20417.6
- Microsoft.DotNet.ApiCompat: from 5.0.0-beta.20411.8 to 5.0.0-beta.20417.6
Diffstat (limited to 'eng/common/cross/toolchain.cmake')
| -rw-r--r-- | eng/common/cross/toolchain.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index 256670799..137736c0a 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -19,7 +19,9 @@ if(TARGET_ARCH_NAME STREQUAL "armel") endif() elseif(TARGET_ARCH_NAME STREQUAL "arm") set(CMAKE_SYSTEM_PROCESSOR armv7l) - if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/armv6-alpine-linux-musleabihf) + if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/armv7-alpine-linux-musleabihf) + set(TOOLCHAIN "armv7-alpine-linux-musleabihf") + elseif(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/armv6-alpine-linux-musleabihf) set(TOOLCHAIN "armv6-alpine-linux-musleabihf") else() set(TOOLCHAIN "arm-linux-gnueabihf") |