[PATCH 1/2] config: Use G++ as C++ compiler

Tyler Retzlaff roretzla at linux.microsoft.com
Tue Jun 21 21:53:41 CEST 2022
Previous message (by thread): [PATCH 1/2] config: Use G++ as C++ compiler
Next message (by thread): [PATCH 1/2] config: Use G++ as C++ compiler
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
On Tue, Jun 21, 2022 at 02:28:23PM +0200, Stanislaw Kardach wrote:
> Through some mixup all cross-files for PowerPC and ARM platforms 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).
> 
> Signed-off-by: Stanislaw Kardach <kda at semihalf.com>
> ---
>  config/arm/arm32_armv8_linux_gcc           | 2 +-
>  config/arm/arm64_armada_linux_gcc          | 2 +-
>  config/arm/arm64_armv8_linux_gcc           | 2 +-
>  config/arm/arm64_bluefield_linux_gcc       | 2 +-
>  config/arm/arm64_centriq2400_linux_gcc     | 2 +-
>  config/arm/arm64_cn10k_linux_gcc           | 2 +-
>  config/arm/arm64_cn9k_linux_gcc            | 2 +-
>  config/arm/arm64_dpaa_linux_gcc            | 2 +-
>  config/arm/arm64_emag_linux_gcc            | 2 +-
>  config/arm/arm64_graviton2_linux_gcc       | 2 +-
>  config/arm/arm64_kunpeng920_linux_gcc      | 2 +-
>  config/arm/arm64_kunpeng930_linux_gcc      | 2 +-
>  config/arm/arm64_n1sdp_linux_gcc           | 2 +-
>  config/arm/arm64_n2_linux_gcc              | 2 +-
>  config/arm/arm64_stingray_linux_gcc        | 2 +-
>  config/arm/arm64_thunderx2_linux_gcc       | 2 +-
>  config/arm/arm64_thunderxt83_linux_gcc     | 2 +-
>  config/arm/arm64_thunderxt88_linux_gcc     | 2 +-
>  config/ppc/ppc64le-power8-linux-gcc        | 2 +-
>  config/ppc/ppc64le-power8-linux-gcc-ubuntu | 2 +-
>  20 files changed, 20 insertions(+), 20 deletions(-)
> 
> diff --git a/config/arm/arm32_armv8_linux_gcc b/config/arm/arm32_armv8_linux_gcc
> index 7f2977e49d..269a60ba19 100644
> --- a/config/arm/arm32_armv8_linux_gcc
> +++ b/config/arm/arm32_armv8_linux_gcc
> @@ -1,6 +1,6 @@
>  [binaries]
>  c = ['ccache', 'arm-linux-gnueabihf-gcc']
> -cpp = ['ccache', 'arm-linux-gnueabihf-cpp']
> +cpp = ['ccache', 'arm-linux-gnueabihf-g++']

suggest the variable should be 'cxx' not 'cpp' (to be consistent with
other build systems in the linux world)

>  ar = 'arm-linux-gnueabihf-gcc-ar'
>  strip = 'arm-linux-gnueabihf-strip'
>  pkgconfig = 'arm-linux-gnueabihf-pkg-config'
> diff --git a/config/arm/arm64_armada_linux_gcc b/config/arm/arm64_armada_linux_gcc
> index 1566999101..635b4946a3 100644
> --- a/config/arm/arm64_armada_linux_gcc
> +++ b/config/arm/arm64_armada_linux_gcc
> @@ -1,6 +1,6 @@
>  [binaries]
>  c = ['ccache', 'aarch64-linux-gnu-gcc']
> -cpp = ['ccache', 'aarch64-linux-gnu-cpp']
> +cpp = ['ccache', '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 048c2d9f29..529694b49d 100644
> --- a/config/arm/arm64_armv8_linux_gcc
> +++ b/config/arm/arm64_armv8_linux_gcc
> @@ -1,6 +1,6 @@
>  [binaries]
>  c = ['ccache', 'aarch64-linux-gnu-gcc']
> -cpp = ['ccache', 'aarch64-linux-gnu-cpp']
> +cpp = ['ccache', '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 38df3c198b..1286227915 100644
> --- a/config/arm/arm64_bluefield_linux_gcc
> +++ b/config/arm/arm64_bluefield_linux_gcc
> @@ -1,6 +1,6 @@
>  [binaries]
>  c = ['ccache', 'aarch64-linux-gnu-gcc']
> -cpp = ['ccache', 'aarch64-linux-gnu-cpp']
> +cpp = ['ccache', '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_centriq2400_linux_gcc b/config/arm/arm64_centriq2400_linux_gcc
> index 0966eef2c5..bc8737e072 100644
> --- a/config/arm/arm64_centriq2400_linux_gcc
> +++ b/config/arm/arm64_centriq2400_linux_gcc
> @@ -1,6 +1,6 @@
>  [binaries]
>  c = ['ccache', 'aarch64-linux-gnu-gcc']
> -cpp = ['ccache', 'aarch64-linux-gnu-cpp']
> +cpp = ['ccache', '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_cn10k_linux_gcc b/config/arm/arm64_cn10k_linux_gcc
> index 201e0ccd59..05d2d64cf2 100644
> --- a/config/arm/arm64_cn10k_linux_gcc
> +++ b/config/arm/arm64_cn10k_linux_gcc
> @@ -1,6 +1,6 @@
>  [binaries]
>  c = ['ccache', 'aarch64-linux-gnu-gcc']
> -cpp = ['ccache', 'aarch64-linux-gnu-cpp']
> +cpp = ['ccache', '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_cn9k_linux_gcc b/config/arm/arm64_cn9k_linux_gcc
> index a9b4d51958..7416454de0 100644
> --- a/config/arm/arm64_cn9k_linux_gcc
> +++ b/config/arm/arm64_cn9k_linux_gcc
> @@ -1,6 +1,6 @@
>  [binaries]
>  c = ['ccache', 'aarch64-linux-gnu-gcc']
> -cpp = ['ccache', 'aarch64-linux-gnu-cpp']
> +cpp = ['ccache', '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 0d5761bd72..8465b5097b 100644
> --- a/config/arm/arm64_dpaa_linux_gcc
> +++ b/config/arm/arm64_dpaa_linux_gcc
> @@ -1,6 +1,6 @@
>  [binaries]
>  c = ['ccache', 'aarch64-linux-gnu-gcc']
> -cpp = ['ccache', 'aarch64-linux-gnu-cpp']
> +cpp = ['ccache', '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 16ec49fc32..248169ed68 100644
> --- a/config/arm/arm64_emag_linux_gcc
> +++ b/config/arm/arm64_emag_linux_gcc
> @@ -1,6 +1,6 @@
>  [binaries]
>  c = ['ccache', 'aarch64-linux-gnu-gcc']
> -cpp = ['ccache', 'aarch64-linux-gnu-cpp']
> +cpp = ['ccache', '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_graviton2_linux_gcc b/config/arm/arm64_graviton2_linux_gcc
> index 094c540f50..fdb298bb11 100644
> --- a/config/arm/arm64_graviton2_linux_gcc
> +++ b/config/arm/arm64_graviton2_linux_gcc
> @@ -1,6 +1,6 @@
>  [binaries]
>  c = ['ccache', 'aarch64-linux-gnu-gcc']
> -cpp = ['ccache', 'aarch64-linux-gnu-cpp']
> +cpp = ['ccache', '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_kunpeng920_linux_gcc b/config/arm/arm64_kunpeng920_linux_gcc
> index fc057c9063..193fb48a61 100644
> --- a/config/arm/arm64_kunpeng920_linux_gcc
> +++ b/config/arm/arm64_kunpeng920_linux_gcc
> @@ -1,6 +1,6 @@
>  [binaries]
>  c = ['ccache', 'aarch64-linux-gnu-gcc']
> -cpp = ['ccache', 'aarch64-linux-gnu-cpp']
> +cpp = ['ccache', '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_kunpeng930_linux_gcc b/config/arm/arm64_kunpeng930_linux_gcc
> index 5f43941fae..e4281ceb4f 100644
> --- a/config/arm/arm64_kunpeng930_linux_gcc
> +++ b/config/arm/arm64_kunpeng930_linux_gcc
> @@ -1,6 +1,6 @@
>  [binaries]
>  c = ['ccache', 'aarch64-linux-gnu-gcc']
> -cpp = ['ccache', 'aarch64-linux-gnu-cpp']
> +cpp = ['ccache', '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 fc123ab53f..2806a4241b 100644
> --- a/config/arm/arm64_n1sdp_linux_gcc
> +++ b/config/arm/arm64_n1sdp_linux_gcc
> @@ -1,6 +1,6 @@
>  [binaries]
>  c = ['ccache', 'aarch64-linux-gnu-gcc']
> -cpp = ['ccache', 'aarch64-linux-gnu-cpp']
> +cpp = ['ccache', '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_n2_linux_gcc b/config/arm/arm64_n2_linux_gcc
> index 930bd5c236..7404bd197b 100644
> --- a/config/arm/arm64_n2_linux_gcc
> +++ b/config/arm/arm64_n2_linux_gcc
> @@ -1,6 +1,6 @@
>  [binaries]
>  c = ['ccache', 'aarch64-linux-gnu-gcc']
> -cpp = ['ccache', 'aarch64-linux-gnu-cpp']
> +cpp = ['ccache', '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_stingray_linux_gcc b/config/arm/arm64_stingray_linux_gcc
> index 5dfcd974fd..08148b5c3d 100644
> --- a/config/arm/arm64_stingray_linux_gcc
> +++ b/config/arm/arm64_stingray_linux_gcc
> @@ -1,6 +1,6 @@
>  [binaries]
>  c = ['ccache', 'aarch64-linux-gnu-gcc']
> -cpp = ['ccache', 'aarch64-linux-gnu-cpp']
> +cpp = ['ccache', '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 c1f5995d93..32ae938e95 100644
> --- a/config/arm/arm64_thunderx2_linux_gcc
> +++ b/config/arm/arm64_thunderx2_linux_gcc
> @@ -1,6 +1,6 @@
>  [binaries]
>  c = ['ccache', 'aarch64-linux-gnu-gcc']
> -cpp = ['ccache', 'aarch64-linux-gnu-cpp']
> +cpp = ['ccache', '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_thunderxt83_linux_gcc b/config/arm/arm64_thunderxt83_linux_gcc
> index 52746e2e59..e9d9e62d44 100644
> --- a/config/arm/arm64_thunderxt83_linux_gcc
> +++ b/config/arm/arm64_thunderxt83_linux_gcc
> @@ -1,6 +1,6 @@
>  [binaries]
>  c = ['ccache', 'aarch64-linux-gnu-gcc']
> -cpp = ['ccache', 'aarch64-linux-gnu-cpp']
> +cpp = ['ccache', '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_thunderxt88_linux_gcc b/config/arm/arm64_thunderxt88_linux_gcc
> index fed7eb791e..c6e5a5656a 100644
> --- a/config/arm/arm64_thunderxt88_linux_gcc
> +++ b/config/arm/arm64_thunderxt88_linux_gcc
> @@ -1,6 +1,6 @@
>  [binaries]
>  c = ['ccache', 'aarch64-linux-gnu-gcc']
> -cpp = ['ccache', 'aarch64-linux-gnu-cpp']
> +cpp = ['ccache', '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/ppc/ppc64le-power8-linux-gcc b/config/ppc/ppc64le-power8-linux-gcc
> index 465044e427..8c2db89382 100644
> --- a/config/ppc/ppc64le-power8-linux-gcc
> +++ b/config/ppc/ppc64le-power8-linux-gcc
> @@ -1,6 +1,6 @@
>  [binaries]
>  c = ['ccache', 'powerpc64le-linux-gcc']
> -cpp = ['ccache', 'powerpc64le-linux-cpp']
> +cpp = ['ccache', 'powerpc64le-linux-g++']
>  ar = 'powerpc64le-linux-gcc-ar'
>  strip = 'powerpc64le-linux-strip'
>  
> diff --git a/config/ppc/ppc64le-power8-linux-gcc-ubuntu b/config/ppc/ppc64le-power8-linux-gcc-ubuntu
> index 44d7e0100a..3027d66f8d 100644
> --- a/config/ppc/ppc64le-power8-linux-gcc-ubuntu
> +++ b/config/ppc/ppc64le-power8-linux-gcc-ubuntu
> @@ -1,6 +1,6 @@
>  [binaries]
>  c = ['ccache', 'powerpc64le-linux-gnu-gcc']
> -cpp = ['ccache', 'powerpc64le-linux-gnu-cpp']
> +cpp = ['ccache', 'powerpc64le-linux-gnu-g++']
>  ar = 'powerpc64le-linux-gnu-ar'
>  strip = 'powerpc64le-linux-gnu-strip'
>  
> -- 
> 2.30.2
Previous message (by thread): [PATCH 1/2] config: Use G++ as C++ compiler
Next message (by thread): [PATCH 1/2] config: Use G++ as C++ compiler
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the dev mailing list