Only add '-bu' option to FPMAKE_OPT if DISABLE_FPMAKE_BUILD_UNIT variable is not set

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

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