From ae2f2fee247ad0f80f5a122fd174fa16cddd5438 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Wed, 6 Mar 2019 16:22:41 +0000 Subject: [PATCH] build: rename linuxapp to linux in meson cross files Rename the cross files for meson compilation from having linuxapp in the name to just linux in the name. Signed-off-by: Bruce Richardson --- .../arm/{arm64_armv8_linuxapp_gcc => arm64_armv8_linux_gcc} | 0 .../arm/{arm64_dpaa2_linuxapp_gcc => arm64_dpaa2_linux_gcc} | 0 config/arm/{arm64_dpaa_linuxapp_gcc => arm64_dpaa_linux_gcc} | 0 .../{arm64_thunderx_linuxapp_gcc => arm64_thunderx_linux_gcc} | 0 devtools/test-meson-builds.sh | 2 +- doc/build-sdk-meson.txt | 4 ++-- 6 files changed, 3 insertions(+), 3 deletions(-) rename config/arm/{arm64_armv8_linuxapp_gcc => arm64_armv8_linux_gcc} (100%) rename config/arm/{arm64_dpaa2_linuxapp_gcc => arm64_dpaa2_linux_gcc} (100%) rename config/arm/{arm64_dpaa_linuxapp_gcc => arm64_dpaa_linux_gcc} (100%) rename config/arm/{arm64_thunderx_linuxapp_gcc => arm64_thunderx_linux_gcc} (100%) diff --git a/config/arm/arm64_armv8_linuxapp_gcc b/config/arm/arm64_armv8_linux_gcc similarity index 100% rename from config/arm/arm64_armv8_linuxapp_gcc rename to config/arm/arm64_armv8_linux_gcc diff --git a/config/arm/arm64_dpaa2_linuxapp_gcc b/config/arm/arm64_dpaa2_linux_gcc similarity index 100% rename from config/arm/arm64_dpaa2_linuxapp_gcc rename to config/arm/arm64_dpaa2_linux_gcc diff --git a/config/arm/arm64_dpaa_linuxapp_gcc b/config/arm/arm64_dpaa_linux_gcc similarity index 100% rename from config/arm/arm64_dpaa_linuxapp_gcc rename to config/arm/arm64_dpaa_linux_gcc diff --git a/config/arm/arm64_thunderx_linuxapp_gcc b/config/arm/arm64_thunderx_linux_gcc similarity index 100% rename from config/arm/arm64_thunderx_linuxapp_gcc rename to config/arm/arm64_thunderx_linux_gcc diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh index f82a0fd6c7..f0d5c9a84b 100755 --- a/devtools/test-meson-builds.sh +++ b/devtools/test-meson-builds.sh @@ -67,7 +67,7 @@ if command -v $c >/dev/null 2>&1 ; then # compile the general v8a also for clang to increase coverage export CC="ccache clang" build build-arm64-host-clang $use_shared \ - --cross-file config/arm/arm64_armv8_linuxapp_gcc + --cross-file config/arm/arm64_armv8_linux_gcc for f in config/arm/arm*gcc ; do export CC="ccache gcc" diff --git a/doc/build-sdk-meson.txt b/doc/build-sdk-meson.txt index 0a3316386f..912cb3a8cc 100644 --- a/doc/build-sdk-meson.txt +++ b/doc/build-sdk-meson.txt @@ -157,9 +157,9 @@ command:: For example if the target machine is arm64 we can use the following command:: - meson arm-build --cross-file config/arm/arm64_armv8_linuxapp_gcc + meson arm-build --cross-file config/arm/arm64_armv8_linux_gcc -where config/arm/arm64_armv8_linuxapp_gcc contains the following +where config/arm/arm64_armv8_linux_gcc contains the following parameters:: [binaries] -- 2.20.1