* rtl/macos/dos.pp: Remove unused unixutil in _USES clause of rtl/macos/dos.pp source.

* rtl/macos/Makefile.fpc: Update dependency list DOS_DEPS: remove unixutil and add missing macostp.

* rtl/macos/Makefile: Regenerate.
This commit is contained in:
Pierre Muller 2024-01-09 11:42:18 +01:00
parent 19fe377455
commit 2c622e2fe6
3 changed files with 4 additions and 6 deletions

View File

@ -892,7 +892,7 @@ DYNLIBS_DEPS_OS=$(DLUNIT)$(PPUEXT)
DYNLIBSINCDIR=$(UNIXINC)
UNITPREFIX=rtl
OBJPASDIR=$(RTL)/objpas
DOS_DEPS_OS=$(UNIXUTILUNIT)$(PPUEXT) $(MACUTILSUNIT)$(PPUEXT)
DOS_DEPS_OS=$(MACOSTPUNIT)$(PPUEXT) $(MACUTILSUNIT)$(PPUEXT)
SYSUTILS_DEPS_OS=$(DOSUNIT)$(PPUEXT)
ifeq ($(CPU_OS_TARGET),m68k-macosclassic)
override TARGET_UNITS+=$(SYSTEMUNIT) $(UUCHARUNIT) $(STRINGSUNIT) $(MACPASUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(MACOSTPUNIT) $(MACUTILSUNIT) $(EXTPASUNIT) $(HEAPTRCUNIT) $(GETOPTSUNIT) $(UNIXUTILUNIT) $(DOSUNIT) $(CMEMUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CTYPESUNIT) $(SYSCONSTUNIT) $(SORTBASEUNIT) $(SYSUTILSUNIT) $(CLASSESUNIT) $(TYPINFOUNIT) $(FGLUNIT) $(TYPESUNIT) $(MATHUNIT) $(UFLOAT128UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(SFPUX80UNIT) $(SOFTFPUUNIT)

View File

@ -47,7 +47,7 @@ UNITPREFIX=rtl
# Paths
OBJPASDIR=$(RTL)/objpas
DOS_DEPS_OS=$(UNIXUTILUNIT)$(PPUEXT) $(MACUTILSUNIT)$(PPUEXT)
DOS_DEPS_OS=$(MACOSTPUNIT)$(PPUEXT) $(MACUTILSUNIT)$(PPUEXT)
SYSUTILS_DEPS_OS=$(DOSUNIT)$(PPUEXT)
[rules]

View File

@ -69,12 +69,10 @@ Implementation
{$IFDEF FPC_DOTTEDUNITS}
Uses
MacOSApi.MacUtils,
UnixApi.Utils {for FNMatch};
MacOSApi.MacUtils;
{$ELSE FPC_DOTTEDUNITS}
Uses
macutils,
unixutil {for FNMatch};
macutils;
{$ENDIF FPC_DOTTEDUNITS}
{$UNDEF USE_FEXPAND_INC}