summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorRoman Stratiienko <r.stratiienko@gmail.com>2021-06-16 18:00:06 +0300
committerMarge Bot <eric+marge@anholt.net>2021-07-07 18:32:28 +0000
commit80f42e1d15003c38da01eaff8766f449f4f429b4 (patch)
treef411e0400b535092998338ab985132ea86477bfe /android
parent97c19ac3588b32de30009d40fcb55cc666ae7d2b (diff)
AOSP: Do not add '-Wl,--gc-sections' to the linker arguments
With '-Wl,--gc-sections' meson.build cc.has_function() will never fail, providing wrong input to the build system. Fixes: 8621bd8d5e67 ("android: Add scripts to build using meson") Signed-off-by: Roman Stratiienko <r.stratiienko@gmail.com> Tested-by: Mauro Rossi <issor.oruam@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11637>
Diffstat (limited to 'android')
-rw-r--r--android/mesa3d_cross.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/android/mesa3d_cross.mk b/android/mesa3d_cross.mk
index ac06efcee15..da63cc9393f 100644
--- a/android/mesa3d_cross.mk
+++ b/android/mesa3d_cross.mk
@@ -170,8 +170,9 @@ define m-lld-flags-cleaned
$(subst out/,$(AOSP_ABSOLUTE_PATH)/out/, \
$(subst -Wl$(comma)--fatal-warnings,, \
$(subst -Wl$(comma)--no-undefined-version,, \
- $(patsubst %dummy.o,, \
- $(m-lld-flags))))))
+ $(subst -Wl$(comma)--gc-sections,, \
+ $(patsubst %dummy.o,, \
+ $(m-lld-flags)))))))
endef
define m-cpp-flags