diff options
author | dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> | 2019-11-15 01:51:24 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-15 01:51:24 +0300 |
commit | d5e90f5814c48cbae141e93f13194934e73c1265 (patch) | |
tree | d4255d59ffc8e657a3a13301b044f30c4f2f96d1 /eng/common/cross | |
parent | 742b71402b3f6c88fc22956a819d7ea00408f42c (diff) |
[master] Update dependencies from dotnet/arcade (#779)
* Update dependencies from https://github.com/dotnet/arcade build 20191004.2
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19504.2
* Update dependencies from https://github.com/dotnet/arcade build 20191005.1
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19505.1
* Update dependencies from https://github.com/dotnet/arcade build 20191006.1
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19506.1
* Update dependencies from https://github.com/dotnet/arcade build 20191009.5
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19509.5
* Update dependencies from https://github.com/dotnet/arcade build 20191010.4
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19510.4
* Update dependencies from https://github.com/dotnet/arcade build 20191011.1
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19511.1
* Update dependencies from https://github.com/dotnet/arcade build 20191015.1
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19515.1
* Update dependencies from https://github.com/dotnet/arcade build 20191015.2
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19515.2
* Update dependencies from https://github.com/dotnet/arcade build 20191017.8
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19517.8
* Update dependencies from https://github.com/dotnet/arcade build 20191018.2
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19518.2
* Update dependencies from https://github.com/dotnet/arcade build 20191021.4
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19521.4
* Update dependencies from https://github.com/dotnet/arcade build 20191022.8
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19522.8
* Update dependencies from https://github.com/dotnet/arcade build 20191023.3
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19523.3
* Update dependencies from https://github.com/dotnet/arcade build 20191024.2
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19524.2
* Update dependencies from https://github.com/dotnet/arcade build 20191025.2
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19525.2
* Update dependencies from https://github.com/dotnet/arcade build 20191026.1
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19526.1
* Update dependencies from https://github.com/dotnet/arcade build 20191027.3
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19527.3
* Update dependencies from https://github.com/dotnet/arcade build 20191028.5
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19528.5
* Update dependencies from https://github.com/dotnet/arcade build 20191029.9
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19529.9
* Update dependencies from https://github.com/dotnet/arcade build 20191030.15
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19530.15
* Update dependencies from https://github.com/dotnet/arcade build 20191031.14
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19531.14
* Update dependencies from https://github.com/dotnet/arcade build 20191101.3
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19551.3
* Update dependencies from https://github.com/dotnet/arcade build 20191102.1
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19552.1
* Update dependencies from https://github.com/dotnet/arcade build 20191104.3
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19554.3
* Update dependencies from https://github.com/dotnet/arcade build 20191105.7
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19555.7
* Update dependencies from https://github.com/dotnet/arcade build 20191106.10
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19556.10
* Update dependencies from https://github.com/dotnet/arcade build 20191107.20
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19557.20
* Update dependencies from https://github.com/dotnet/arcade build 20191108.11
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19558.11
* Update dependencies from https://github.com/dotnet/arcade build 20191111.8
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19561.8
* Update dependencies from https://github.com/dotnet/arcade build 20191112.5
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19562.5
* Update dependencies from https://github.com/dotnet/arcade build 20191113.9
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19563.9
* Update dependencies from https://github.com/dotnet/arcade build 20191114.2
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19564.2
Diffstat (limited to 'eng/common/cross')
-rw-r--r-- | eng/common/cross/toolchain.cmake | 49 |
1 files changed, 15 insertions, 34 deletions
diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index 071d41124..0eea7d1df 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -31,6 +31,10 @@ else() message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only armel, arm, arm64 and x86 are supported!") endif() +if(DEFINED ENV{TOOLCHAIN}) + set(TOOLCHAIN $ENV{TOOLCHAIN}) +endif() + # Specify include paths if(TARGET_ARCH_NAME STREQUAL "armel") if(DEFINED TIZEN_TOOLCHAIN) @@ -39,48 +43,25 @@ if(TARGET_ARCH_NAME STREQUAL "armel") endif() endif() -# add_compile_param - adds only new options without duplicates. -# arg0 - list with result options, arg1 - list with new options. -# arg2 - optional argument, quick summary string for optional using CACHE FORCE mode. -macro(add_compile_param) - if(NOT ${ARGC} MATCHES "^(2|3)$") - message(FATAL_ERROR "Wrong using add_compile_param! Two or three parameters must be given! See add_compile_param description.") - endif() - foreach(OPTION ${ARGV1}) - if(NOT ${ARGV0} MATCHES "${OPTION}($| )") - set(${ARGV0} "${${ARGV0}} ${OPTION}") - if(${ARGC} EQUAL "3") # CACHE FORCE mode - set(${ARGV0} "${${ARGV0}}" CACHE STRING "${ARGV2}" FORCE) - endif() - endif() - endforeach() -endmacro() +set(CMAKE_SYSROOT "${CROSS_ROOTFS}") +set(CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/usr") +set(CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/usr") +set(CMAKE_ASM_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/usr") # Specify link flags -add_compile_param(CROSS_LINK_FLAGS "--sysroot=${CROSS_ROOTFS}") -add_compile_param(CROSS_LINK_FLAGS "--gcc-toolchain=${CROSS_ROOTFS}/usr") -add_compile_param(CROSS_LINK_FLAGS "--target=${TOOLCHAIN}") -add_compile_param(CROSS_LINK_FLAGS "-fuse-ld=gold") if(TARGET_ARCH_NAME STREQUAL "armel") if(DEFINED TIZEN_TOOLCHAIN) # For Tizen only - add_compile_param(CROSS_LINK_FLAGS "-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") - add_compile_param(CROSS_LINK_FLAGS "-L${CROSS_ROOTFS}/lib") - add_compile_param(CROSS_LINK_FLAGS "-L${CROSS_ROOTFS}/usr/lib") - add_compile_param(CROSS_LINK_FLAGS "-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") + add_link_options("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") + add_link_options("-L${CROSS_ROOTFS}/lib") + add_link_options("-L${CROSS_ROOTFS}/usr/lib") + add_link_options("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") endif() elseif(TARGET_ARCH_NAME STREQUAL "x86") - add_compile_param(CROSS_LINK_FLAGS "-m32") + add_link_options(-m32) endif() -add_compile_param(CMAKE_EXE_LINKER_FLAGS "${CROSS_LINK_FLAGS}" "TOOLCHAIN_EXE_LINKER_FLAGS") -add_compile_param(CMAKE_SHARED_LINKER_FLAGS "${CROSS_LINK_FLAGS}" "TOOLCHAIN_EXE_LINKER_FLAGS") -add_compile_param(CMAKE_MODULE_LINKER_FLAGS "${CROSS_LINK_FLAGS}" "TOOLCHAIN_EXE_LINKER_FLAGS") - # Specify compile options -add_compile_options("--sysroot=${CROSS_ROOTFS}") -add_compile_options("--target=${TOOLCHAIN}") -add_compile_options("--gcc-toolchain=${CROSS_ROOTFS}/usr") if(TARGET_ARCH_NAME MATCHES "^(arm|armel|arm64)$") set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN}) @@ -103,7 +84,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86") add_compile_options(-Wno-error=unused-command-line-argument) endif() -# Set LLDB include and library paths +# Set LLDB include and library paths for builds that need lldb. if(TARGET_ARCH_NAME MATCHES "^(arm|armel|x86)$") if(TARGET_ARCH_NAME STREQUAL "x86") set(LLVM_CROSS_DIR "$ENV{LLVM_CROSS_HOME}") @@ -131,7 +112,7 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel|x86)$") endif() endif() -set(CMAKE_FIND_ROOT_PATH "${CROSS_ROOTFS}") + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) |