Browse Source

* 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.
Pierre Muller 1 year ago
parent
commit
2c622e2fe6
3 changed files with 4 additions and 6 deletions
  1. 1 1
      rtl/macos/Makefile
  2. 1 1
      rtl/macos/Makefile.fpc
  3. 2 4
      rtl/macos/dos.pp

+ 1 - 1
rtl/macos/Makefile

@@ -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)

+ 1 - 1
rtl/macos/Makefile.fpc

@@ -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]

+ 2 - 4
rtl/macos/dos.pp

@@ -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}