From 1ba231fb75be5bffd806cbd09ac285d1f8f15e3d Mon Sep 17 00:00:00 2001 From: Mauro Rossi Date: Sat, 20 Nov 2021 00:47:18 +0100 Subject: [PATCH] android: define cpp_rtti=false because libLLVM is built w/o RTTI (v2) libLLVM for Android is built without RTTI, but after commit ad86267 mesa inherits meson default RTTI enabled state. cpp_rtti=false is added to meson options in android/mesa3d_cross.mk (v2) Add Fixes tag and use spaces instead of tabs for aligning the trailing \ Signed-off-by: Mauro Rossi Fixes: ad862674 ("meson: Don't override built-in cpp_rtti option, error if it's invalid") Cc: "21.3" "21.2" mesa-stable Reviewed-by: Marijn Suijten Part-of: --- android/mesa3d_cross.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/android/mesa3d_cross.mk b/android/mesa3d_cross.mk index 3e0622159fe..e211cb8f269 100644 --- a/android/mesa3d_cross.mk +++ b/android/mesa3d_cross.mk @@ -93,6 +93,7 @@ MESON_GEN_NINJA := \ -Dvulkan-drivers=$(subst $(space),$(comma),$(subst radeon,amd,$(BOARD_MESA3D_VULKAN_DRIVERS))) \ -Dgbm=enabled \ -Degl=enabled \ + -Dcpp_rtti=false \ MESON_BUILD := PATH=/usr/bin:/bin:/sbin:$$PATH ninja -C $(MESON_OUT_DIR)/build