From 32ec0fffa6fbe58b0fd76901c6a7dc8a9cfc79b1 Mon Sep 17 00:00:00 2001 From: Roman Stratiienko Date: Mon, 22 Nov 2021 18:57:01 +0200 Subject: [PATCH] android.mk: Add missing variables to the make target Android build system may use different internal variables to specify cflags/cppflags. Small change in product confguration may force Android to use diffrent set of variables, therefore we should keep all of them attached to the make rule's target. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/5549 Fixes: 8621bd8d5e67 ("android: Add scripts to build using meson") Signed-off-by: Roman Stratiienko Acked-by: Jesse Natalie Reviewed-by: Marijn Suijten Part-of: --- android/mesa3d_cross.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/android/mesa3d_cross.mk b/android/mesa3d_cross.mk index 9c7cc36f48f..254f7f8cc82 100644 --- a/android/mesa3d_cross.mk +++ b/android/mesa3d_cross.mk @@ -129,7 +129,6 @@ $(MESON_GEN_FILES_TARGET): PRIVATE_C_INCLUDES := $(my_c_includes) $(MESON_GEN_FILES_TARGET): PRIVATE_IMPORTED_INCLUDES := $(imported_includes) $(MESON_GEN_FILES_TARGET): PRIVATE_LDFLAGS := $(my_ldflags) $(MESON_GEN_FILES_TARGET): PRIVATE_LDLIBS := $(my_ldlibs) -$(MESON_GEN_FILES_TARGET): PRIVATE_TARGET_GLOBAL_LDFLAGS := $(my_target_global_ldflags) $(MESON_GEN_FILES_TARGET): PRIVATE_TIDY_CHECKS := $(my_tidy_checks) $(MESON_GEN_FILES_TARGET): PRIVATE_TIDY_FLAGS := $(my_tidy_flags) $(MESON_GEN_FILES_TARGET): PRIVATE_ARFLAGS := $(my_arflags) @@ -140,6 +139,11 @@ $(MESON_GEN_FILES_TARGET): PRIVATE_ALL_OBJECTS := $(strip $(all_objects)) $(MESON_GEN_FILES_TARGET): PRIVATE_ARM_CFLAGS := $(normal_objects_cflags) +$(MESON_GEN_FILES_TARGET): PRIVATE_TARGET_GLOBAL_CFLAGS := $(my_target_global_cflags) +$(MESON_GEN_FILES_TARGET): PRIVATE_TARGET_GLOBAL_CONLYFLAGS := $(my_target_global_conlyflags) +$(MESON_GEN_FILES_TARGET): PRIVATE_TARGET_GLOBAL_CPPFLAGS := $(my_target_global_cppflags) +$(MESON_GEN_FILES_TARGET): PRIVATE_TARGET_GLOBAL_LDFLAGS := $(my_target_global_ldflags) + $(MESON_GEN_FILES_TARGET): PRIVATE_TARGET_LIBCRT_BUILTINS := $(my_target_libcrt_builtins) $(MESON_GEN_FILES_TARGET): PRIVATE_TARGET_LIBATOMIC := $(my_target_libatomic) $(MESON_GEN_FILES_TARGET): PRIVATE_TARGET_CRTBEGIN_SO_O := $(my_target_crtbegin_so_o)