diff options
| author | Guillaume Chatelet <gchatelet@google.com> | 2019-01-15 12:19:06 +0300 |
|---|---|---|
| committer | Guillaume Chatelet <gchatelet@google.com> | 2019-01-15 12:19:06 +0300 |
| commit | 5177c6974f5b57eb9ee9ac1aef03616226c4ce15 (patch) | |
| tree | 82a1c0f93774b9ff7153130db935d6239d53a1be /scripts | |
| parent | 78635347dbb03a2d3cc8543308e2bede4d6c12f9 (diff) | |
Declare CMAKE_SYSTEM_NAME/SYSTEM for Linaro builds
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/run_integration.sh | 3 | ||||
| -rwxr-xr-x | scripts/test_integration.sh | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/scripts/run_integration.sh b/scripts/run_integration.sh index 546871f..f39ab59 100755 --- a/scripts/run_integration.sh +++ b/scripts/run_integration.sh @@ -110,6 +110,9 @@ function expand_linaro_config() { local SYSROOT_FOLDER=${ARCHIVE_FOLDER}/${SYSROOT_RELATIVE_FOLDER} local GCC_FOLDER=${ARCHIVE_FOLDER}/${GCC_RELATIVE_FOLDER} + CMAKE_ADDITIONAL_ARGS+=" -DCMAKE_SYSTEM_NAME=Linux" + CMAKE_ADDITIONAL_ARGS+=" -DCMAKE_SYSTEM_PROCESSOR=${TARGET}" + CMAKE_ADDITIONAL_ARGS+=" -DCMAKE_SYSROOT=${SYSROOT_FOLDER}" CMAKE_ADDITIONAL_ARGS+=" -DCMAKE_C_COMPILER=${GCC_FOLDER}/bin/${TARGET}-gcc" CMAKE_ADDITIONAL_ARGS+=" -DCMAKE_CXX_COMPILER=${GCC_FOLDER}/bin/${TARGET}-g++" diff --git a/scripts/test_integration.sh b/scripts/test_integration.sh index 53d1d3b..91babe8 100755 --- a/scripts/test_integration.sh +++ b/scripts/test_integration.sh @@ -1,3 +1,5 @@ +#!/bin/bash + source "$(dirname -- "$0")"/run_integration.sh # Toolchains for little-endian, 64-bit ARMv8 for GNU/Linux systems @@ -7,7 +9,7 @@ function set_aarch64-linux-gnu() { QEMU_ARCH=aarch64 } -# Toolchains for little-endian, hard-float, 32-bit ARMv7 (and earlier) for GNU/Linux systems +# Toolchains for little-endian, hard-float, 32-bit ARMv7 (and earlier) for GNU/Linux systems function set_arm-linux-gnueabihf() { TOOLCHAIN=LINARO TARGET=arm-linux-gnueabihf |