From aec4cb393db69ea269324db48f7157db0c9c7a6f Mon Sep 17 00:00:00 2001
From: Pierre Muller <pierre@freepascal.org>
Date: Tue, 9 Jul 2024 12:46:18 +0000
Subject: [PATCH] Only add '-bu' option to FPMAKE_OPT if
 DISABLE_FPMAKE_BUILD_UNIT variable is not set

---
 packages/Makefile.fpc | 2 ++
 utils/Makefile.fpc    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/packages/Makefile.fpc b/packages/Makefile.fpc
index dddd4514db..6403ee9f8c 100644
--- a/packages/Makefile.fpc
+++ b/packages/Makefile.fpc
@@ -65,7 +65,9 @@ FPMAKE_OPT+=--localunitdir=..
 FPMAKE_OPT+=$(FPC_TARGETOPT)
 FPMAKE_OPT+=$(addprefix -o ,$(FPCOPT))
 FPMAKE_OPT+=--compiler=$(FPC)
+ifndef DISABLE_FPMAKE_BUILD_UNIT
 FPMAKE_OPT+=-bu
+endif
 ifdef FPC_DOTTEDUNITS
 FPMAKE_OPT+=-ns
 FPMAKE_OPT+=-ns -o -dFPC_DOTTEDUNITS
diff --git a/utils/Makefile.fpc b/utils/Makefile.fpc
index a01c270562..3a199dc771 100644
--- a/utils/Makefile.fpc
+++ b/utils/Makefile.fpc
@@ -49,7 +49,9 @@ FPMAKE_OPT+=--globalunitdir=../packages
 FPMAKE_OPT+=$(FPC_TARGETOPT)
 FPMAKE_OPT+=$(addprefix -o ,$(FPCOPT))
 FPMAKE_OPT+=--compiler=$(FPC)
+ifndef DISABLE_FPMAKE_BUILD_UNIT
 FPMAKE_OPT+=-bu
+endif
 ifndef BUILDFULLNATIVE
 FPMAKE_OPT+=-scp
 endif