Examinc OPT and CROSSOPT instead of FPCOPT in [prerules] to check if syscall unit needs objpas dependency

This commit is contained in:
Pierre Muller 2024-01-07 16:12:09 +01:00
parent 82ac429954
commit 3edd92dab1
2 changed files with 4 additions and 4 deletions

View File

@ -907,8 +907,8 @@ else
SYSCALL_DEPS_OS=$(ARCH)/syscallh.inc $(ARCH)/sysnr.inc SYSCALL_DEPS_OS=$(ARCH)/syscallh.inc $(ARCH)/sysnr.inc
endif endif
endif endif
ifneq ($(filter -dFPC_USE_LIBC,$(FPCOPT)),) ifneq ($(filter -dFPC_USE_LIBC,$(OPT) $(CROSSOPT)),)
SYSCALL_DEPS_OS+=$(OBJPASUNITUNIT)$(PPUEXT) SYSCALL_DEPS_OS+=$(OBJPASUNIT)$(PPUEXT)
endif endif
SYSUTILSDIR=$(UNIXINC) SYSUTILSDIR=$(UNIXINC)
SYSUTILS_DEPS_OS=$(SYSUTILS_UNIX_DEPS) $(LINUXUNIT)$(PPUEXT) SYSUTILS_DEPS_OS=$(SYSUTILS_UNIX_DEPS) $(LINUXUNIT)$(PPUEXT)

View File

@ -79,8 +79,8 @@ endif
# syscall unit compiled with -dFPC_USE_LIBC # syscall unit compiled with -dFPC_USE_LIBC
# required mode objfpc which adds a dependency to # required mode objfpc which adds a dependency to
# objpas unit # objpas unit
ifneq ($(filter -dFPC_USE_LIBC,$(FPCOPT)),) ifneq ($(filter -dFPC_USE_LIBC,$(OPT) $(CROSSOPT)),)
SYSCALL_DEPS_OS+=$(OBJPASUNITUNIT)$(PPUEXT) SYSCALL_DEPS_OS+=$(OBJPASUNIT)$(PPUEXT)
endif endif
SYSUTILSDIR=$(UNIXINC) SYSUTILSDIR=$(UNIXINC)