From b0062ae1dad54c401033e41d7ad98326d58fd32c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 18 Aug 2020 16:42:25 +0000 Subject: 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 --- eng/common/cross/toolchain.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'eng/common/cross/toolchain.cmake') 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") -- cgit v1.2.3