From 7d3cebd76714287a513fb99ed88433f9ad12dc29 Mon Sep 17 00:00:00 2001
From: Ralph Versteegen <teeemcee@gmail.com>
Date: Sat, 20 Nov 2021 15:50:59 +1300
Subject: [PATCH] android: Fix fbextra.x not being installed

Although it may not be needed, this seems to differ between NDK installations.
---
 makefile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/makefile b/makefile
index c23593cfa..1661b48b8 100644
--- a/makefile
+++ b/makefile
@@ -695,10 +695,12 @@ LIBFBGFXMT_C    := $(patsubst $(libfbgfxobjdir)/%,$(libfbgfxmtobjdir)/%,$(LIBFBG
 LIBFBGFXMT_S    := $(patsubst $(libfbgfxobjdir)/%,$(libfbgfxmtobjdir)/%,$(LIBFBGFX_S))
 LIBFBGFXMTPIC_C := $(patsubst $(libfbgfxobjdir)/%,$(libfbgfxmtpicobjdir)/%,$(LIBFBGFX_C))
 
+
+RTL_LIBS := $(libdir)/$(FB_LDSCRIPT)
 ifdef ENABLE_NONPIC
-  RTL_LIBS := $(libdir)/$(FB_LDSCRIPT) $(libdir)/fbrt0.o $(libdir)/libfb.a
-  FBRTL_LIBS := $(libdir)/libfbrt.a
-  GFX_LIBS := $(libdir)/libfbgfx.a
+  RTL_LIBS += $(libdir)/fbrt0.o $(libdir)/libfb.a
+  FBRTL_LIBS += $(libdir)/libfbrt.a
+  GFX_LIBS += $(libdir)/libfbgfx.a
 endif
 ifdef ENABLE_PIC
   RTL_LIBS += $(libdir)/fbrt0pic.o $(libdir)/libfbpic.a