diff options
| author | Mauro Rossi <issor.oruam@gmail.com> | 2022-10-29 09:33:19 +0200 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2022-11-07 17:46:42 +0000 |
| commit | fd8ec189e575d5220d8b4c30647fa6de57928e07 (patch) | |
| tree | 83bf64e0c3da6e587c72c751c158ae77aec4a7f8 /android | |
| parent | 41ee836c9ab89ee7b1a1384b64a341d3876f9491 (diff) | |
| download | mesa-fd8ec189e575d5220d8b4c30647fa6de57928e07.tar.gz | |
Android.mk: Fix gnu++14 related build failures
This patch filters-out '-std=gnu++14' from the cflags obtained
from AOSP/KATI dummy target output to avoid the following building errors:
FAILED: src/gallium/drivers/r600/45f68e3@@r600@sta/sfn_sfn_assembler.cpp.o
...
clang++ ... -std=c++17 ... -std=gnu++14
...
In file included from ../src/gallium/drivers/r600/sfn/sfn_assembler.cpp:27:
In file included from ../src/gallium/drivers/r600/sfn/sfn_assembler.h:32:
In file included from ../src/gallium/drivers/r600/sfn/sfn_shader.h:31:
../src/gallium/drivers/r600/sfn/sfn_instr.h:369:56: error: no template named 'is_base_of_v' in namespace 'std'; did you mean 'is_base_of'?
template <typename T, typename = std::enable_if_t<std::is_base_of_v<Instr, T>>>
~~~~~^~~~~~~~~~~~
is_base_of
/home/utente/pie-x86_kernel/external/libcxx/include/type_traits:1412:29: note: 'is_base_of' declared here
struct _LIBCPP_TEMPLATE_VIS is_base_of
^
In file included from ../src/gallium/drivers/r600/sfn/sfn_assembler.cpp:27:
In file included from ../src/gallium/drivers/r600/sfn/sfn_assembler.h:32:
In file included from ../src/gallium/drivers/r600/sfn/sfn_shader.h:31:
../src/gallium/drivers/r600/sfn/sfn_instr.h:369:51: error: template argument for non-type template parameter must be an expression
template <typename T, typename = std::enable_if_t<std::is_base_of_v<Instr, T>>>
^~~~~~~~~~~~~~~~~~~~~~~~~~~~
/home/utente/pie-x86_kernel/external/libcxx/include/type_traits:439:16: note: template parameter is declared here
template <bool _Bp, class _Tp = void> using enable_if_t = typename enable_if<_Bp, _Tp>::type;
^
2 errors generated.
Cc: "22.2" "22.3" mesa-stable
Reviewed-by: Roman Stratiienko <r.stratiienko@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19563>
Diffstat (limited to 'android')
| -rw-r--r-- | android/mesa3d_cross.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/android/mesa3d_cross.mk b/android/mesa3d_cross.mk index 470ee3ca101..727aaac32dd 100644 --- a/android/mesa3d_cross.mk +++ b/android/mesa3d_cross.mk @@ -202,7 +202,7 @@ define m-c-flags endef define filter-c-flags - $(filter-out -std=gnu++17 -std=gnu99 -fno-rtti, \ + $(filter-out -std=gnu++17 -std=gnu++14 -std=gnu99 -fno-rtti, \ $(patsubst -W%,, $1)) endef |