diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2020-08-25 16:24:40 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2020-08-25 19:09:29 +0100 |
| commit | 6848ade239f300e5ace8c1d2d93dd23415ef07be (patch) | |
| tree | 68d4b6f966b8eaadf7ad42c08e337b5947c10e8e | |
| parent | 98c69e6f8c0996531013f6d7ee4a87af6e9d097c (diff) | |
| download | klibc-maint-6848ade239f300e5ace8c1d2d93dd23415ef07be.tar.gz | |
test-many-klibc: Change $makeflags to an array variable
We will need to add arguments containing spaces, which is not
possible at present.
| -rwxr-xr-x | test-many-klibcs | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/test-many-klibcs b/test-many-klibcs index da5fab1..30a05a8 100755 --- a/test-many-klibcs +++ b/test-many-klibcs @@ -16,10 +16,10 @@ build_gnu() { make -C ../linux "ARCH=$kernelarch" \ "INSTALL_HDR_PATH=$PWD/build/gnu-$toolsarch/linux" headers_install \ || return - echo "I: Building with ARCH=$arch CROSS_COMPILE=$toolsarch- $makeflags" + echo "I: Building with ARCH=$arch CROSS_COMPILE=$toolsarch- ${makeflags[*]}" make -C "build/gnu-$toolsarch" -f "$PWD/../klibc/Makefile" -j"$nproc" \ "ARCH=$arch" "CROSS_COMPILE=$toolsarch-" "KBUILD_SRC=$PWD/../klibc" \ - $makeflags all test \ + "${makeflags[@]}" all test \ || return } @@ -32,11 +32,11 @@ build_llvm() { make -C ../linux "ARCH=$kernelarch" \ "INSTALL_HDR_PATH=$PWD/build/llvm-$toolsarch/linux" headers_install \ || return - echo "I: Building with ARCH=$arch CROSS_COMPILE=$toolsarch- CC='clang -target $toolsarch' HOSTCC=clang LD=ld.lld $makeflags" + echo "I: Building with ARCH=$arch CROSS_COMPILE=$toolsarch- CC='clang -target $toolsarch' HOSTCC=clang LD=ld.lld ${makeflags[*]}" make -C "build/llvm-$toolsarch" -f "$PWD/../klibc/Makefile" -j"$nproc" \ "ARCH=$arch" "CROSS_COMPILE=$toolsarch-" "KBUILD_SRC=$PWD/../klibc" \ "CC=clang -target $toolsarch" "HOSTCC=clang" "LD=ld.lld" \ - $makeflags all test \ + "${makeflags[@]}" all test \ || return } @@ -52,7 +52,7 @@ do_install() { # Install klibc itself make -C "build/$tools-$toolsarch" -f "$PWD/../klibc/Makefile" \ "ARCH=$arch" "CROSS_COMPILE=$toolsarch-" "KBUILD_SRC=$PWD/../klibc" \ - $makeflags INSTALLROOT="$PWD/install" install \ + "${makeflags[@]}" INSTALLROOT="$PWD/install" install \ || return # Install shared-library tests @@ -221,7 +221,8 @@ process() { tools="$3" toolsarch="$4" qemuarch="$5" - makeflags="${6:-}" + shift 5 + makeflags=("$@") case "$qemuarch" in *:*) @@ -253,9 +254,9 @@ echo "I: Using concurrency of $nproc" process alpha alpha gnu alpha-linux-gnu alpha # arm OABI is no longer supported in Debian. #process arm arm gnu arm-linux-gnu arm -process arm arm gnu arm-linux-gnueabi arm "CONFIG_AEABI=y" -process arm arm gnu arm-linux-gnueabihf arm "CONFIG_AEABI=y CPU_ARCH=armv7-a CPU_TUNE=cortex-a8 CONFIG_KLIBC_THUMB=y" -process arm arm llvm arm-linux-gnueabihf arm "CONFIG_AEABI=y CPU_ARCH=armv7-a CPU_TUNE=cortex-a8 CONFIG_KLIBC_THUMB=y" +process arm arm gnu arm-linux-gnueabi arm CONFIG_AEABI=y +process arm arm gnu arm-linux-gnueabihf arm CONFIG_AEABI=y CPU_ARCH=armv7-a CPU_TUNE=cortex-a8 CONFIG_KLIBC_THUMB=y +process arm arm llvm arm-linux-gnueabihf arm CONFIG_AEABI=y CPU_ARCH=armv7-a CPU_TUNE=cortex-a8 CONFIG_KLIBC_THUMB=y process arm64 arm64 gnu aarch64-linux-gnu aarch64 process arm64 arm64 llvm aarch64-linux-gnu aarch64 process i386 x86 gnu i686-linux-gnu i386 |