[PATCH 19.11] config: fix C++ cross compiler for ARM

[Christian Ehrhardt]

On Thu, Jul 7, 2022 at 11:48 AM Stanislaw Kardach <kda at semihalf.com> wrote:
>
> [ upstream commit f75dd6d3b1215c2e7cdbdc290b5789517c8cfe10 ]

Thank you, applied to the WIP branch for 19.11.13

> Through some mixup all cross-files for ARM platform were using C
> Preprocessor (cpp) instead of GCC (g++).
> This caused meson to fail detecting the C++ compiler presence and
> therefore disabling some targets (i.e. C++ include file checks).
>
> Fixes: e53a5299d219 ("build: support vendor specific ARM cross builds")
>
> Signed-off-by: Stanislaw Kardach <kda at semihalf.com>
> Acked-by: Bruce Richardson <bruce.richardson at intel.com>
> ---
>  config/arm/arm64_armada_linux_gcc    | 2 +-
>  config/arm/arm64_armv8_linux_gcc     | 2 +-
>  config/arm/arm64_bluefield_linux_gcc | 2 +-
>  config/arm/arm64_dpaa_linux_gcc      | 2 +-
>  config/arm/arm64_emag_linux_gcc      | 2 +-
>  config/arm/arm64_n1sdp_linux_gcc     | 2 +-
>  config/arm/arm64_octeontx2_linux_gcc | 2 +-
>  config/arm/arm64_thunderx2_linux_gcc | 2 +-
>  config/arm/arm64_thunderx_linux_gcc  | 2 +-
>  9 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/config/arm/arm64_armada_linux_gcc b/config/arm/arm64_armada_linux_gcc
> index fa40c0398f..d78c99e8e8 100644
> --- a/config/arm/arm64_armada_linux_gcc
> +++ b/config/arm/arm64_armada_linux_gcc
> @@ -1,6 +1,6 @@
>  [binaries]
>  c = 'aarch64-linux-gnu-gcc'
> -cpp = 'aarch64-linux-gnu-cpp'
> +cpp = 'aarch64-linux-gnu-g++'
>  ar = 'aarch64-linux-gnu-ar'
>  as = 'aarch64-linux-gnu-as'
>  strip = 'aarch64-linux-gnu-strip'
> diff --git a/config/arm/arm64_armv8_linux_gcc b/config/arm/arm64_armv8_linux_gcc
> index 88f0ff9dae..057d70bbdd 100644
> --- a/config/arm/arm64_armv8_linux_gcc
> +++ b/config/arm/arm64_armv8_linux_gcc
> @@ -1,6 +1,6 @@
>  [binaries]
>  c = 'aarch64-linux-gnu-gcc'
> -cpp = 'aarch64-linux-gnu-cpp'
> +cpp = 'aarch64-linux-gnu-g++'
>  ar = 'aarch64-linux-gnu-gcc-ar'
>  strip = 'aarch64-linux-gnu-strip'
>  pkgconfig = 'aarch64-linux-gnu-pkg-config'
> diff --git a/config/arm/arm64_bluefield_linux_gcc b/config/arm/arm64_bluefield_linux_gcc
> index 86797d23cd..616e633495 100644
> --- a/config/arm/arm64_bluefield_linux_gcc
> +++ b/config/arm/arm64_bluefield_linux_gcc
> @@ -1,6 +1,6 @@
>  [binaries]
>  c = 'aarch64-linux-gnu-gcc'
> -cpp = 'aarch64-linux-gnu-cpp'
> +cpp = 'aarch64-linux-gnu-g++'
>  ar = 'aarch64-linux-gnu-gcc-ar'
>  strip = 'aarch64-linux-gnu-strip'
>  pkgconfig = 'aarch64-linux-gnu-pkg-config'
> diff --git a/config/arm/arm64_dpaa_linux_gcc b/config/arm/arm64_dpaa_linux_gcc
> index 1a46821543..0108bb952a 100644
> --- a/config/arm/arm64_dpaa_linux_gcc
> +++ b/config/arm/arm64_dpaa_linux_gcc
> @@ -1,6 +1,6 @@
>  [binaries]
>  c = 'aarch64-linux-gnu-gcc'
> -cpp = 'aarch64-linux-gnu-cpp'
> +cpp = 'aarch64-linux-gnu-g++'
>  ar = 'aarch64-linux-gnu-ar'
>  as = 'aarch64-linux-gnu-as'
>  strip = 'aarch64-linux-gnu-strip'
> diff --git a/config/arm/arm64_emag_linux_gcc b/config/arm/arm64_emag_linux_gcc
> index 8edcd3e976..3bb5134224 100644
> --- a/config/arm/arm64_emag_linux_gcc
> +++ b/config/arm/arm64_emag_linux_gcc
> @@ -1,6 +1,6 @@
>  [binaries]
>  c = 'aarch64-linux-gnu-gcc'
> -cpp = 'aarch64-linux-gnu-cpp'
> +cpp = 'aarch64-linux-gnu-g++'
>  ar = 'aarch64-linux-gnu-gcc-ar'
>  strip = 'aarch64-linux-gnu-strip'
>  pkgconfig = 'aarch64-linux-gnu-pkg-config'
> diff --git a/config/arm/arm64_n1sdp_linux_gcc b/config/arm/arm64_n1sdp_linux_gcc
> index 022e063039..421d06c77f 100644
> --- a/config/arm/arm64_n1sdp_linux_gcc
> +++ b/config/arm/arm64_n1sdp_linux_gcc
> @@ -1,6 +1,6 @@
>  [binaries]
>  c = 'aarch64-linux-gnu-gcc'
> -cpp = 'aarch64-linux-gnu-cpp'
> +cpp = 'aarch64-linux-gnu-g++'
>  ar = 'aarch64-linux-gnu-gcc-ar'
>  strip = 'aarch64-linux-gnu-strip'
>  pkgconfig = 'aarch64-linux-gnu-pkg-config'
> diff --git a/config/arm/arm64_octeontx2_linux_gcc b/config/arm/arm64_octeontx2_linux_gcc
> index 365bd7cbdd..0d7a66c97e 100644
> --- a/config/arm/arm64_octeontx2_linux_gcc
> +++ b/config/arm/arm64_octeontx2_linux_gcc
> @@ -1,6 +1,6 @@
>  [binaries]
>  c = 'aarch64-linux-gnu-gcc'
> -cpp = 'aarch64-linux-gnu-cpp'
> +cpp = 'aarch64-linux-gnu-g++'
>  ar = 'aarch64-linux-gnu-gcc-ar'
>  strip = 'aarch64-linux-gnu-strip'
>  pkgconfig = 'aarch64-linux-gnu-pkg-config'
> diff --git a/config/arm/arm64_thunderx2_linux_gcc b/config/arm/arm64_thunderx2_linux_gcc
> index 2b41acc615..24346ffe71 100644
> --- a/config/arm/arm64_thunderx2_linux_gcc
> +++ b/config/arm/arm64_thunderx2_linux_gcc
> @@ -1,6 +1,6 @@
>  [binaries]
>  c = 'aarch64-linux-gnu-gcc'
> -cpp = 'aarch64-linux-gnu-cpp'
> +cpp = 'aarch64-linux-gnu-g++'
>  ar = 'aarch64-linux-gnu-gcc-ar'
>  strip = 'aarch64-linux-gnu-strip'
>  pkgconfig = 'aarch64-linux-gnu-pkg-config'
> diff --git a/config/arm/arm64_thunderx_linux_gcc b/config/arm/arm64_thunderx_linux_gcc
> index 6572ab615d..cbf60bac73 100644
> --- a/config/arm/arm64_thunderx_linux_gcc
> +++ b/config/arm/arm64_thunderx_linux_gcc
> @@ -1,6 +1,6 @@
>  [binaries]
>  c = 'aarch64-linux-gnu-gcc'
> -cpp = 'aarch64-linux-gnu-cpp'
> +cpp = 'aarch64-linux-gnu-g++'
>  ar = 'aarch64-linux-gnu-gcc-ar'
>  strip = 'aarch64-linux-gnu-strip'
>  pkgconfig = 'aarch64-linux-gnu-pkg-config'
> --
> 2.34.1
>


-- 
Christian Ehrhardt
Senior Staff Engineer, Ubuntu Server
Canonical Ltd