paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-05 09:18:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move setting of SYSTEMDIR variable to prerules to get correct source directory for system unit on BSD targets

Browse Source
This commit is contained in:
Pierre Muller 2023-10-16 21:44:17 +02:00
parent 9588204585
commit e523b9b282
8 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtl/dragonfly/Makefile
View File

@ -900,6 +900,7 @@ DYNLIBS_DEPS_OS=$(DLUNIT)$(PPUEXT)
DYNLIBSINCDIR=$(UNIXINC)
SYSCALL_DEPS_OS=sysnr.inc $(BSDPROCINC)/syscallh.inc
BASEUNIX_DEPS_OS=$(SYSCTLUNIT)$(PPUEXT)
SYSTEMDIR = $(BSDINC)
SYSUTILSDIR=$(UNIXINC)
SYSUTILS_DEPS_OS = $(UNIXUNIT)$(PPUEXT) $(ERRORSUNIT)$(PPUEXT)
loaders+=gprt0
@ -2935,7 +2936,6 @@ SYSINCDEPS=$(addprefix $(INC)/,$(SYSINCNAMES))
include $(PROCINC)/makefile.cpu
SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
SYSDEPS = unxconst.inc $(SYSINCDEPS) $(SYSCPUDEPS)
SYSTEMDIR = $(BSDINC)
prt0$(OEXT) : $(CPU_TARGET)/prt0.as
$(AS) -o $(UNITTARGETDIRPREFIX)prt0$(OEXT) $(CPU_TARGET)/prt0.as
cprt0$(OEXT) : $(CPU_TARGET)/cprt0.as

4
rtl/dragonfly/Makefile.fpc
View File

@ -69,6 +69,9 @@ DYNLIBS_DEPS_OS=$(DLUNIT)$(PPUEXT)
DYNLIBSINCDIR=$(UNIXINC)
SYSCALL_DEPS_OS=sysnr.inc $(BSDPROCINC)/syscallh.inc
BASEUNIX_DEPS_OS=$(SYSCTLUNIT)$(PPUEXT)
SYSTEMDIR = $(BSDINC)
SYSUTILSDIR=$(UNIXINC)
SYSUTILS_DEPS_OS = $(UNIXUNIT)$(PPUEXT) $(ERRORSUNIT)$(PPUEXT)
@ -97,7 +100,6 @@ SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
# Put system unit dependencies together.
SYSDEPS = unxconst.inc $(SYSINCDEPS) $(SYSCPUDEPS)
SYSTEMDIR = $(BSDINC)
#
# Loaders

2
rtl/freebsd/Makefile
View File

@ -901,6 +901,7 @@ DOSDIR=$(UNIXINC)
DYNLIBS_DEPS_OS=$(DLUNIT)$(PPUEXT)
DYNLIBSINCDIR=$(UNIXINC)
SYSCALL_DEPS_OS = sysnr.inc $(BSDPROCINC)/syscallh.inc
SYSTEMDIR = $(BSDINC)
SYSUTILSDIR=$(UNIXINC)
SYSUTILS_DEPS_OS = $(UNIXUNIT)$(PPUEXT) $(ERRORSUNIT)$(PPUEXT)
loaders+=gprt0
@ -2977,7 +2978,6 @@ SYSINCDEPS=$(addprefix $(INC)/,$(SYSINCNAMES))
include $(PROCINC)/makefile.cpu
SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
SYSDEPS = unxconst.inc $(SYSINCDEPS) $(SYSCPUDEPS)
SYSTEMDIR = $(BSDINC)
prt0$(OEXT) : $(CPU_TARGET)/prt0.as
$(AS) $(ASTARGET) -o $(UNITTARGETDIRPREFIX)prt0$(OEXT) $(CPU_TARGET)/prt0.as
cprt0$(OEXT) : $(CPU_TARGET)/cprt0.as

2
rtl/freebsd/Makefile.fpc
View File

@ -69,6 +69,7 @@ DYNLIBS_DEPS_OS=$(DLUNIT)$(PPUEXT)
DYNLIBSINCDIR=$(UNIXINC)
SYSCALL_DEPS_OS = sysnr.inc $(BSDPROCINC)/syscallh.inc
SYSTEMDIR = $(BSDINC)
SYSUTILSDIR=$(UNIXINC)
SYSUTILS_DEPS_OS = $(UNIXUNIT)$(PPUEXT) $(ERRORSUNIT)$(PPUEXT)
@ -103,7 +104,6 @@ SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
# Put system unit dependencies together.
SYSDEPS = unxconst.inc $(SYSINCDEPS) $(SYSCPUDEPS)
SYSTEMDIR = $(BSDINC)
#
# Loaders

2
rtl/netbsd/Makefile
View File

@ -900,6 +900,7 @@ DOSDIR=$(UNIXINC)
DYNLIBS_DEPS_OS=$(DLUNIT)$(PPUEXT)
DYNLIBSINCDIR=$(UNIXINC)
SYSCALL_DEPS_OS = sysnr.inc $(BSDPROCINC)/syscallh.inc
SYSTEMDIR = $(BSDINC)
SYSUTILSDIR=$(UNIXINC)
SYSUTILS_DEPS_OS = $(UNIXUNIT)$(PPUEXT) $(ERRORSUNIT)$(PPUEXT)
LINUXUNIT=
@ -3029,7 +3030,6 @@ SYSINCDEPS=$(addprefix $(INC)/,$(SYSINCNAMES))
include $(PROCINC)/makefile.cpu
SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
SYSDEPS = sysconst.inc systypes.inc syscalls.inc $(SYSINCDEPS) $(SYSCPUDEPS)
SYSTEMDIR = $(BSDINC)
prt0$(OEXT) : $(CPU_TARGET)/$(PRT0).as
$(AS) -o $(UNITTARGETDIRPREFIX)prt0$(OEXT) $(CPU_TARGET)/$(PRT0).as
cprt0$(OEXT) : $(CPU_TARGET)/cprt0.as

2
rtl/netbsd/Makefile.fpc
View File

@ -67,6 +67,7 @@ DOSDIR=$(UNIXINC)
DYNLIBS_DEPS_OS=$(DLUNIT)$(PPUEXT)
DYNLIBSINCDIR=$(UNIXINC)
SYSCALL_DEPS_OS = sysnr.inc $(BSDPROCINC)/syscallh.inc
SYSTEMDIR = $(BSDINC)
SYSUTILSDIR=$(UNIXINC)
SYSUTILS_DEPS_OS = $(UNIXUNIT)$(PPUEXT) $(ERRORSUNIT)$(PPUEXT)
@ -100,7 +101,6 @@ SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
# Put system unit dependencies together.
SYSDEPS = sysconst.inc systypes.inc syscalls.inc $(SYSINCDEPS) $(SYSCPUDEPS)
SYSTEMDIR = $(BSDINC)
#
# Loaders

2
rtl/openbsd/Makefile
View File

@ -899,6 +899,7 @@ DOSDIR=$(UNIXINC)
DYNLIBS_DEPS_OS=$(DLUNIT)$(PPUEXT)
DYNLIBSINCDIR=$(UNIXINC)
SYSCALL_DEPS_OS = sysnr.inc setsysnr.inc $(BSDPROCINC)/syscallh.inc
SYSTEMDIR = $(BSDINC)
SYSUTILSDIR=$(UNIXINC)
SYSUTILS_DEPS_OS = $(UNIXUNIT)$(PPUEXT) $(ERRORSUNIT)$(PPUEXT)
LINUXUNIT=
@ -2962,7 +2963,6 @@ SYSINCDEPS=$(addprefix $(INC)/,$(SYSINCNAMES))
include $(PROCINC)/makefile.cpu
SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
SYSDEPS= sysconst.inc systypes.inc syscalls.inc $(SYSINCDEPS) $(SYSCPUDEPS)
SYSTEMDIR = $(BSDINC)
prt0$(OEXT) : $(CPU_TARGET)/$(PRT0).as
$(AS) -o $(UNITTARGETDIRPREFIX)prt0$(OEXT) $(CPU_TARGET)/$(PRT0).as
si_prc$(PPUEXT) : si_prc.pp si_intf.inc si_impl.inc $(ARCH)/openbsd_ident.inc $(ARCH)/si_prc.inc $(SYSTEMUNIT)$(PPUEXT)

2
rtl/openbsd/Makefile.fpc
View File

@ -66,6 +66,7 @@ DOSDIR=$(UNIXINC)
DYNLIBS_DEPS_OS=$(DLUNIT)$(PPUEXT)
DYNLIBSINCDIR=$(UNIXINC)
SYSCALL_DEPS_OS = sysnr.inc setsysnr.inc $(BSDPROCINC)/syscallh.inc
SYSTEMDIR = $(BSDINC)
SYSUTILSDIR=$(UNIXINC)
SYSUTILS_DEPS_OS = $(UNIXUNIT)$(PPUEXT) $(ERRORSUNIT)$(PPUEXT)
@ -108,7 +109,6 @@ SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
# Put system unit dependencies together.
SYSDEPS= sysconst.inc systypes.inc syscalls.inc $(SYSINCDEPS) $(SYSCPUDEPS)
SYSTEMDIR = $(BSDINC)
#
# Loaders