KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Android.mk: Fix c11-related build failures 

When building with Android.mk we are ending-up with:

    gcc ..... -std=gnu99 .... -std=c11 .... target.o
              ^^^^^^^^^^      ^^^^^^^^
                   |              |
    _______________^_____    _____^___________
     AOSP/KATI GENERATED      MESON GENERATED

Some compilers uses first -std=gnu99 option and ignores second,
which results:

    c99 implicit declaration of function static_assert()

This patch filters-out the first '-std=gnu99' from the cflags obtained
from AOSP/KATI dummy target output to avoid such kind of errors.

Signed-off-by: Roman Stratiienko <r.stratiienko@gmail.com>
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Reviewed-by: Mauro Rossi <issor.oruam@gmail.com>
Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17078>
This commit is contained in:
Roman Stratiienko 2022-06-16 13:32:56 +03:00 committed by Marge Bot
parent 4824396572
commit 45267d5181
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
android/mesa3d_cross.mk
View File

@ -203,10 +203,8 @@ define m-c-flags
endef
define filter-c-flags
$(subst -std=gnu++17,, \
$(subst -fno-rtti,, \
$(patsubst -W%,, \
$1)))
$(filter-out -std=gnu++17 -std=gnu99 -fno-rtti, \
$(patsubst -W%,, $1))
endef
define m-c-abs-includes