diff options
Diffstat (limited to 'scripts/ci')
| -rwxr-xr-x | scripts/ci/build.sh | 4 | ||||
| -rwxr-xr-x | scripts/ci/build_arm64.sh | 4 | ||||
| -rwxr-xr-x | scripts/ci/check.sh | 2 | ||||
| -rwxr-xr-x | scripts/ci/check_inline_timer.sh | 2 | ||||
| -rwxr-xr-x | scripts/ci/check_pktio.sh | 2 | ||||
| -rwxr-xr-x | scripts/ci/coverage.sh | 2 |
6 files changed, 10 insertions, 6 deletions
diff --git a/scripts/ci/build.sh b/scripts/ci/build.sh index ae50bf065..38127edc1 100755 --- a/scripts/ci/build.sh +++ b/scripts/ci/build.sh @@ -4,7 +4,7 @@ set -e cd "$(dirname "$0")"/../.. ./bootstrap ./configure \ - --host=${TARGET_ARCH} --build=x86_64-linux-gnu \ + --host=${TARGET_ARCH} --build=${BUILD_ARCH:-x86_64-linux-gnu} \ --prefix=/opt/odp \ ${CONF} @@ -47,7 +47,7 @@ sysctl vm.nr_hugepages=1000 mkdir -p /mnt/huge mount -t hugetlbfs nodev /mnt/huge -if [ "$TARGET_ARCH" = "x86_64-linux-gnu" ] +if [ -z "$TARGET_ARCH" ] || [ "$TARGET_ARCH" == "$BUILD_ARCH" ] then LD_LIBRARY_PATH="/opt/odp/lib:$LD_LIBRARY_PATH" ./odp_hello_inst_dynamic fi diff --git a/scripts/ci/build_arm64.sh b/scripts/ci/build_arm64.sh index abdc5acb8..ad3b95e75 100755 --- a/scripts/ci/build_arm64.sh +++ b/scripts/ci/build_arm64.sh @@ -2,6 +2,10 @@ set -e export TARGET_ARCH=aarch64-linux-gnu +if [[ $(uname -m) =~ ^(arm64|aarch64)$ ]]; then + export BUILD_ARCH=aarch64-linux-gnu +fi + if [ "${CC#clang}" != "${CC}" ] ; then export CC="clang --target=${TARGET_ARCH}" export CXX="clang++ --target=${TARGET_ARCH}" diff --git a/scripts/ci/check.sh b/scripts/ci/check.sh index a181a184b..7b22db066 100755 --- a/scripts/ci/check.sh +++ b/scripts/ci/check.sh @@ -5,7 +5,7 @@ echo 1500 | tee /proc/sys/vm/nr_hugepages mkdir -p /mnt/huge mount -t hugetlbfs nodev /mnt/huge -"`dirname "$0"`"/build_x86_64.sh +"`dirname "$0"`"/build_${ARCH}.sh cd "$(dirname "$0")"/../.. diff --git a/scripts/ci/check_inline_timer.sh b/scripts/ci/check_inline_timer.sh index d2eff7145..1fa9c21f5 100755 --- a/scripts/ci/check_inline_timer.sh +++ b/scripts/ci/check_inline_timer.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -"`dirname "$0"`"/build_x86_64.sh +"`dirname "$0"`"/build_${ARCH}.sh cd "$(dirname "$0")"/../.. diff --git a/scripts/ci/check_pktio.sh b/scripts/ci/check_pktio.sh index d82fe8aad..e61bacc98 100755 --- a/scripts/ci/check_pktio.sh +++ b/scripts/ci/check_pktio.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -"`dirname "$0"`"/build_x86_64.sh +"`dirname "$0"`"/build_${ARCH}.sh cd "$(dirname "$0")"/../.. diff --git a/scripts/ci/coverage.sh b/scripts/ci/coverage.sh index e413c28fb..cdcddfe93 100755 --- a/scripts/ci/coverage.sh +++ b/scripts/ci/coverage.sh @@ -8,7 +8,7 @@ fi cd "$(dirname "$0")"/../.. ./bootstrap ./configure \ - CFLAGS="-O0 -coverage $CLFAGS" CXXFLAGS="-O0 -coverage $CXXFLAGS" LDFLAGS="--coverage $LDFLAGS" \ + CFLAGS="-O0 -coverage $CFLAGS" CXXFLAGS="-O0 -coverage $CXXFLAGS" LDFLAGS="--coverage $LDFLAGS" \ --enable-debug=full --enable-helper-linux export CCACHE_DISABLE=1 make -j $(nproc) |