paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-14 17:29:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Better dependencies for ctypes, remove double unit rules

Browse Source
This commit is contained in:
Michaël Van Canneyt 2023-07-27 22:13:27 +02:00 committed by Pierre Muller
parent 029a87b86e
commit 1410332764
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rtl/darwin/Makefile
View File

@ -887,7 +887,10 @@ UNITPREFIX=rtl
INITCDIR=$(UNIXINC)
SYSUTILS_DEPS_OS=$(SYSCTLUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) $(UNIXUNIT)$(PPUEXT) $(ERRORSUNIT)$(PPUEXT) $(SYSCONSTUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT)
BASEUNIX_DEPS_OS=$(SYSCTLUNIT)$(PPUEXT)
DYNLIBS_DEPS_OS=$(DLUNIT)$(PPUEXT);
DYNLIBS_DEPS_OS=$(DLUNIT)$(PPUEXT)
CTYPES_DEPS_OS=$(UNIXTYPEUNIT)$(PPUEXT)
EXEINFO_DEPS_OS=$(BASEUNIXUNIT)$(PPUEXT)
FPEXTRES_DEPS_OS=$(BASEUNIXUNIT)$(PPUEXT)
ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
SYSTEMUNIT=system
else
@ -2771,10 +2774,6 @@ SYSINCDEPS=$(addprefix $(INC)/,$(SYSINCNAMES))
include $(PROCINC)/makefile.cpu
SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) $(OSPROCINC)/sighnd.inc $(OSPROCINC)/sig_cpu.inc
SYSTEMUNIT_DEPS=$(BSDINC)/$(SYSTEMUNIT).pp $(SYSDEPS)\
$(SYSTEMUNIT_DEPS_OS) $(SYSTEMUNIT_DEPS_CPU)
$(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT_DEPS)
$(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $<
SYSINIT_DEPS=sysinit.pas $(SYSTEMUNIT)$(PPUEXT)\
$(SYSINIT_DEPS_OS) $(SYSINIT_DEPS_CPU)
sysinit$(PPUEXT) : $(SYSINIT_DEPS)

11
rtl/darwin/Makefile.fpc
View File

@ -75,7 +75,10 @@ INITCDIR=$(UNIXINC)
SYSUTILS_DEPS_OS=$(SYSCTLUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) $(UNIXUNIT)$(PPUEXT) $(ERRORSUNIT)$(PPUEXT) $(SYSCONSTUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT)
BASEUNIX_DEPS_OS=$(SYSCTLUNIT)$(PPUEXT)
DYNLIBS_DEPS_OS=$(DLUNIT)$(PPUEXT);
DYNLIBS_DEPS_OS=$(DLUNIT)$(PPUEXT)
CTYPES_DEPS_OS=$(UNIXTYPEUNIT)$(PPUEXT)
EXEINFO_DEPS_OS=$(BASEUNIXUNIT)$(PPUEXT)
FPEXTRES_DEPS_OS=$(BASEUNIXUNIT)$(PPUEXT)
ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
SYSTEMUNIT=system
@ -129,12 +132,6 @@ SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) $(OSPROCINC)/sighnd.inc $(OSPROCINC)/sig_cpu
#
SYSTEMUNIT_DEPS=$(BSDINC)/$(SYSTEMUNIT).pp $(SYSDEPS)\
$(SYSTEMUNIT_DEPS_OS) $(SYSTEMUNIT_DEPS_CPU)
$(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT_DEPS)
$(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $<
SYSINIT_DEPS=sysinit.pas $(SYSTEMUNIT)$(PPUEXT)\
$(SYSINIT_DEPS_OS) $(SYSINIT_DEPS_CPU)