summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorAlessandro Astone <ales.astone@gmail.com>2022-07-23 17:37:32 +0200
committerMarge Bot <emma+marge@anholt.net>2022-09-05 22:10:07 +0000
commit554b19b616a16ad049e73d036660a271be00c572 (patch)
treeb5b2cd44303620108d79ae27af6f80362c88a187 /android
parent5017e805bb1f57b482cfbcfd27d78806c782f48a (diff)
downloadmesa-554b19b616a16ad049e73d036660a271be00c572.tar.gz
Android.mk: Filter out --build-id=md5 linker flag
To avoid conflicts with meson-generated --build-id linker option Cc: "22.0" "22.1" "22.2" mesa-stable Reviewed-by: Roman Stratiienko <r.stratiienko@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17715>
Diffstat (limited to 'android')
-rw-r--r--android/mesa3d_cross.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/android/mesa3d_cross.mk b/android/mesa3d_cross.mk
index 52a3fb7c912..5375a9f5af4 100644
--- a/android/mesa3d_cross.mk
+++ b/android/mesa3d_cross.mk
@@ -169,13 +169,14 @@ define m-lld-flags
endef
define m-lld-flags-cleaned
+ $(patsubst -Wl$(comma)--build-id=%,, \
$(subst prebuilts/,$(AOSP_ABSOLUTE_PATH)/prebuilts/, \
$(subst $(OUT_DIR)/,$(call relative-to-absolute,$(OUT_DIR))/, \
$(subst -Wl$(comma)--fatal-warnings,, \
$(subst -Wl$(comma)--no-undefined-version,, \
$(subst -Wl$(comma)--gc-sections,, \
$(patsubst %dummy.o,, \
- $(m-lld-flags)))))))
+ $(m-lld-flags))))))))
endef
define m-cpp-flags