From b12932c7f880a8da618f9446229e6de9b6c64c76 Mon Sep 17 00:00:00 2001
From: Pierre Muller <pierre@freepascal.org>
Date: Mon, 25 Sep 2023 22:27:53 +0200
Subject: [PATCH] Handle specific main cwstring.pp source for android OS

---
 rtl/android/Makefile.fpc | 3 +++
 rtl/inc/Makefile.rtl     | 8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/rtl/android/Makefile.fpc b/rtl/android/Makefile.fpc
index 2dc33093e9..d3f0d2cc2f 100644
--- a/rtl/android/Makefile.fpc
+++ b/rtl/android/Makefile.fpc
@@ -61,6 +61,9 @@ PTYPESINCDIR=$(LINUXINC)
 SYSCALL_DEPS_OS=$(LINUXINC)/$(ARCH)/syscallh.inc $(LINUXINC)/$(ARCH)/sysnr.inc
 SYSUTILS_DEPS_OS=$(DLUNIT)$(PPUEXT)
 
+# Android has a specific file for cwstring.pp unit main source
+CWSTRINGDIR=$(OSDIR)
+
 UNITPREFIX=rtl
 
 CPU_UNITS=
diff --git a/rtl/inc/Makefile.rtl b/rtl/inc/Makefile.rtl
index 6a0a371e14..8b2ba785cf 100644
--- a/rtl/inc/Makefile.rtl
+++ b/rtl/inc/Makefile.rtl
@@ -1480,7 +1480,13 @@ UnixApi.CThreads$(PPUEXT) : $(NSINC)/UnixApi.CThreads.pp $(CTHREADS_DEPS)
 #
 # CWString
 #
-CWSTRING_DEPS=$(UNIXINC)/cwstring.pp  $(RTLDEFSINCDIR)/rtldefs.inc \
+
+ifndef CWSTRINGDIR
+  CWSTRINGDIR=$(UNIXINC)
+  CWSSTRING_INC=$(RTLDEFSINCDIR)/rtldefs.inc
+endif
+
+CWSTRING_DEPS=$(CWSTRINGDIR)/cwstring.pp $(CWSTRING_INC) \
               $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) \
               $(UNIXUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT) $(CTYPESUNIT)$(PPUEXT) \
               $(DYNLIBSUNIT)$(PPUEXT) $(UNIXCPUNIT)$(PPUEXT) \