diff options
| author | Roman Stratiienko <r.stratiienko@gmail.com> | 2021-11-22 18:57:01 +0200 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2021-11-23 21:06:09 +0000 |
| commit | 32ec0fffa6fbe58b0fd76901c6a7dc8a9cfc79b1 (patch) | |
| tree | 98e3774845601b3b4f15e72c747b3af8ae30ca8d /android | |
| parent | 0daed2dc6b3f251bc0fd8bb7bffb577a4c3f4b46 (diff) | |
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 <r.stratiienko@gmail.com>
Acked-by: Jesse Natalie <jenatali@microsoft.com>
Reviewed-by: Marijn Suijten <marijn.suijten@somainline.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13914>
Diffstat (limited to 'android')
| -rw-r--r-- | android/mesa3d_cross.mk | 6 |
1 files changed, 5 insertions, 1 deletions
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) |