Mesa (main): AOSP: Do not add '-Wl,--gc-sections' to the linker arguments

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 80f42e1d15003c38da01eaff8766f449f4f429b4
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=80f42e1d15003c38da01eaff8766f449f4f429b4

Author: Roman Stratiienko <r.stratiienko at gmail.com>
Date:   Wed Jun 16 18:00:06 2021 +0300

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 at gmail.com>
Tested-by: Mauro Rossi <issor.oruam at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11637>

---

 android/mesa3d_cross.mk | 5 +++--
 1 file 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