fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 07:20:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'android/bindgen-m32' into 'main'

Browse source 
android: add support for rust targets in in-tree builds

See merge request mesa/mesa!36748
This commit is contained in:
Faith Ekstrand 2025-12-20 00:49:12 +00:00
commit c299419ce3
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/mesa3d_cross.mk
View file

@ -152,6 +152,9 @@ $(MESON_GEN_FILES_TARGET): PRIVATE_TARGET_LIBCRT_BUILTINS := $(my_target_libcrt_
$(MESON_GEN_FILES_TARGET): PRIVATE_TARGET_LIBATOMIC := $(my_target_libatomic)
$(MESON_GEN_FILES_TARGET): PRIVATE_TARGET_CRTBEGIN_SO_O := $(my_target_crtbegin_so_o)
$(MESON_GEN_FILES_TARGET): PRIVATE_TARGET_CRTEND_SO_O := $(my_target_crtend_so_o)
$(MESON_GEN_FILES_TARGET): PRIVATE_TARGET_TRIPLE := $(my_target_triple)
# Rust has a different name for armv7
$(MESON_GEN_FILES_TARGET): PRIVATE_RUST_TARGET_TRIPLE := $(subst armv7a-,armv7-,$(my_target_triple))
##
define m-lld-flags
@ -250,11 +253,14 @@ $(MESON_GEN_FILES_TARGET): $(sort $(shell find -L $(MESA3D_TOP) -not -path '*/\.
$(foreach inc,$(nospace-includes),'$(call abs-include,$(inc))', )'']\n" \
"c_link_args = [$(foreach flag, $(m-lld-flags-cleaned),'$(flag)',)'']\n" \
"cpp_link_args = [$(foreach flag, $(m-lld-flags-cleaned),'$(flag)',)'']\n" \
"bindgen_clang_arguments = ['-target', '$(PRIVATE_TARGET_TRIPLE)']\n" \
"needs_exe_wrapper = true\n" \
"skip_sanity_check = true\n" \
"[binaries]\n" \
"ar = '$(AOSP_ABSOLUTE_PATH)/$($($(M_TARGET_PREFIX))TARGET_AR)'\n" \
"c = [$(foreach arg,$(PRIVATE_CC),'$(subst prebuilts/,$(AOSP_ABSOLUTE_PATH)/prebuilts/,$(arg))',)'']\n" \
"cpp = [$(foreach arg,$(PRIVATE_CXX),'$(subst prebuilts/,$(AOSP_ABSOLUTE_PATH)/prebuilts/,$(arg))',)'']\n" \
"rust = ['rustc', '--target', '$(PRIVATE_RUST_TARGET_TRIPLE)', '-C', 'link-args=-target $(PRIVATE_RUST_TARGET_TRIPLE) -lc']\n" \
"c_ld = 'lld'\n" \
"cpp_ld = 'lld'\n\n" \
"pkgconfig = ['env', 'PKG_CONFIG_LIBDIR=' + '$(call relative-to-absolute,$(MESON_GEN_DIR))', '/usr/bin/pkg-config']\n\n" \