diff options
| author | Frédéric Bonnard <frediz@debian.org> | 2020-05-07 16:30:52 +0200 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-06-30 20:44:07 +0000 |
| commit | 5a27efdf0e36be8e36390c6a27eef91cbef21e71 (patch) | |
| tree | 880d380fc1d0f9f250e0657df721572c607be20a | |
| parent | cd7acd09b9f8cc68cbe50f9b239029efe7f9cd18 (diff) | |
meson: Revert commit overriding C++ standard with gnu++11 on ppc64el
Since a few versions, mesa now needs c++14 and compiling with gnu++11
on ppc64el fails.
Let's use the default standard and fix the collision of types between
c++ and altivec in a another patch.
Cc: mesa-stable
Signed-off-by: Frédéric Bonnard <frediz@debian.org>
Reviewed-by: Francisco Jerez <currojerez@riseup.net>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4948>
| -rw-r--r-- | meson.build | 9 | ||||
| -rw-r--r-- | src/gallium/frontends/clover/meson.build | 4 |
2 files changed, 0 insertions, 13 deletions
diff --git a/meson.build b/meson.build index 464bbed485a..60c50c21dc1 100644 --- a/meson.build +++ b/meson.build @@ -777,7 +777,6 @@ if _power8 != 'disabled' endif _opencl = get_option('gallium-opencl') -clover_cpp_std = [] if _opencl != 'disabled' if not with_gallium error('OpenCL Clover implementation requires at least one gallium driver.') @@ -796,14 +795,6 @@ if _opencl != 'disabled' dep_spirv_tools = null_dep dep_llvmspirvlib = null_dep endif - - if host_machine.cpu_family().startswith('ppc') and cpp.compiles(''' - #if !defined(__VEC__) || !defined(__ALTIVEC__) - #error "AltiVec not enabled" - #endif''', - name : 'Altivec') - clover_cpp_std += ['cpp_std=gnu++11'] - endif else dep_clc = null_dep dep_spirv_tools = null_dep diff --git a/src/gallium/frontends/clover/meson.build b/src/gallium/frontends/clover/meson.build index 4d429b9a28c..cbd31a68f73 100644 --- a/src/gallium/frontends/clover/meson.build +++ b/src/gallium/frontends/clover/meson.build @@ -72,7 +72,6 @@ libclllvm = static_library( ], gnu_symbol_visibility : 'hidden', dependencies : [dep_llvm, dep_elf, dep_llvmspirvlib], - override_options : clover_cpp_std, ) libclspirv = static_library( @@ -82,7 +81,6 @@ libclspirv = static_library( cpp_args : [clover_opencl_cpp_args, clover_spirv_cpp_args], gnu_symbol_visibility : 'hidden', dependencies : [dep_spirv_tools], - override_options : clover_cpp_std, ) libclnir = static_library( @@ -92,7 +90,6 @@ libclnir = static_library( dependencies : idep_nir, cpp_args : [clover_opencl_cpp_args, clover_spirv_cpp_args], gnu_symbol_visibility : 'hidden', - override_options : clover_cpp_std, ) clover_files = files( @@ -162,5 +159,4 @@ libclover = static_library( ], gnu_symbol_visibility : 'hidden', link_with : [libclllvm, libclspirv, libclnir], - override_options : clover_cpp_std, ) |