paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2026-02-19 18:56:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Fix compilation of wasi RTLs on windows.

Browse Source
This commit is contained in:
Michaël Van Canneyt 2026-02-19 11:01:53 +01:00
parent b94013cc04
commit e7fa63e0eb
5 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtl/inc/Makefile.rtl
View File

@ -1368,9 +1368,11 @@ else
ifeq ($(OS_TARGET),android)
RTLDEFSINCDIR = $(LINUXINC)
else
ifeq ($(RTLDEFSINCDIR),)
RTLDEFSINCDIR = $(OSDIR)
endif
endif
endif
FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp $(RTLDEFSINCDIR)/rtldefs.inc \
$(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(UNICODEDATAUNIT)$(PPUEXT) \

9
rtl/wasip1/Makefile
View File

@ -925,6 +925,9 @@ PROCINC=../$(CPU_TARGET)
UNITPREFIX=rtl
SYSINIT_UNITS=si_prc si_dll
RESUNIT=$(FPINTRESUNIT)
SYSUTILSDIR=$(WASICOMMONINC)
CLASSESDIR=$(WASICOMMONINC)
RTLDEFSINCDIR=$(WASICOMMONINC)
OBJPASDIR=$(RTL)/objpas
ifdef EXCEPTIONS_IN_SYSTEM
override FPCOPT+=-dEXCEPTIONS_IN_SYSTEM
@ -2640,9 +2643,11 @@ else
ifeq ($(OS_TARGET),android)
RTLDEFSINCDIR = $(LINUXINC)
else
ifeq ($(RTLDEFSINCDIR),)
RTLDEFSINCDIR = $(OSDIR)
endif
endif
endif
FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp $(RTLDEFSINCDIR)/rtldefs.inc \
$(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(UNICODEDATAUNIT)$(PPUEXT) \
$(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
@ -2997,12 +3002,12 @@ wasmsem$(PPUEXT) : $(WASMSEMDEPS)
Wasm.Semaphore$(PPUEXT) : $(NSDIR)/wasm32/Wasm.Semaphore.pp $(WASMSEMDEPS)
$(COMPILER) $<
WASIAPIDEPS=$(WASICOMMONINC)/wasiinc/wasitypes.inc $(WASICOMMONINC)/wasiinc/wasiprocs.inc $(SYSTEMUNIT)$(PPUEXT)
wasiapi$(PPUEXT) : wasiapi.pp $(WASIAPIDEPS)
wasiapi$(PPUEXT) : $(WASICOMMONINC)/wasiapi.pp $(WASIAPIDEPS)
$(COMPILER) $< -Fiwasiinc
WASIApi.WASIApi$(PPUEXT) : $(NSOSDIR)/WASIApi.WASIApi.pp $(WASIAPIDEPS)
$(COMPILER) $< -Fiwasiinc
WASIUTILDEPS=$(WASIAPIUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
wasiutil$(PPUEXT) : wasiutil.pp $(WASIUTILDEPS)
wasiutil$(PPUEXT) : $(WASICOMMONINC)/wasiutil.pp $(WASIUTILDEPS)
$(COMPILER) $<
WASIApi.WASIUtil$(PPUEXT) : $(NSOSDIR)/WASIApi.WASIUtil.pp $(WASIUTILDEPS)
$(COMPILER) $<

7
rtl/wasip1/Makefile.fpc
View File

@ -40,6 +40,9 @@ PROCINC=../$(CPU_TARGET)
UNITPREFIX=rtl
SYSINIT_UNITS=si_prc si_dll
RESUNIT=$(FPINTRESUNIT)
SYSUTILSDIR=$(WASICOMMONINC)
CLASSESDIR=$(WASICOMMONINC)
RTLDEFSINCDIR=$(WASICOMMONINC)
# Paths
OBJPASDIR=$(RTL)/objpas
# Insert exception handler in system unit
@ -109,7 +112,7 @@ Wasm.Semaphore$(PPUEXT) : $(NSDIR)/wasm32/Wasm.Semaphore.pp $(WASMSEMDEPS)
WASIAPIDEPS=$(WASICOMMONINC)/wasiinc/wasitypes.inc $(WASICOMMONINC)/wasiinc/wasiprocs.inc $(SYSTEMUNIT)$(PPUEXT)
wasiapi$(PPUEXT) : wasiapi.pp $(WASIAPIDEPS)
wasiapi$(PPUEXT) : $(WASICOMMONINC)/wasiapi.pp $(WASIAPIDEPS)
$(COMPILER) $< -Fiwasiinc
WASIApi.WASIApi$(PPUEXT) : $(NSOSDIR)/WASIApi.WASIApi.pp $(WASIAPIDEPS)
@ -121,7 +124,7 @@ WASIApi.WASIApi$(PPUEXT) : $(NSOSDIR)/WASIApi.WASIApi.pp $(WASIAPIDEPS)
WASIUTILDEPS=$(WASIAPIUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
wasiutil$(PPUEXT) : wasiutil.pp $(WASIUTILDEPS)
wasiutil$(PPUEXT) : $(WASICOMMONINC)/wasiutil.pp $(WASIUTILDEPS)
$(COMPILER) $<
WASIApi.WASIUtil$(PPUEXT) : $(NSOSDIR)/WASIApi.WASIUtil.pp $(WASIUTILDEPS)

9
rtl/wasip1threads/Makefile
View File

@ -925,6 +925,9 @@ PROCINC=../$(CPU_TARGET)
UNITPREFIX=rtl
SYSINIT_UNITS=si_prc si_dll
RESUNIT=$(FPINTRESUNIT)
SYSUTILSDIR=$(WASICOMMONINC)
CLASSESDIR=$(WASICOMMONINC)
RTLDEFSINCDIR=$(WASICOMMONINC)
OBJPASDIR=$(RTL)/objpas
ifdef EXCEPTIONS_IN_SYSTEM
override FPCOPT+=-dEXCEPTIONS_IN_SYSTEM
@ -2640,9 +2643,11 @@ else
ifeq ($(OS_TARGET),android)
RTLDEFSINCDIR = $(LINUXINC)
else
ifeq ($(RTLDEFSINCDIR),)
RTLDEFSINCDIR = $(OSDIR)
endif
endif
endif
FPWIDESTRING_DEPS=$(OBJPASDIR)/fpwidestring.pp $(RTLDEFSINCDIR)/rtldefs.inc \
$(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(UNICODEDATAUNIT)$(PPUEXT) \
$(CHARACTERUNIT)$(PPUEXT) $(CPALLUNIT)$(PPUEXT) \
@ -2997,12 +3002,12 @@ wasmsem$(PPUEXT) : $(WASMSEMDEPS)
Wasm.Semaphore$(PPUEXT) : $(NSDIR)/wasm32/Wasm.Semaphore.pp $(WASMSEMDEPS)
$(COMPILER) $<
WASIAPIDEPS=$(WASICOMMONINC)/wasiinc/wasitypes.inc $(WASICOMMONINC)/wasiinc/wasiprocs.inc $(SYSTEMUNIT)$(PPUEXT)
wasiapi$(PPUEXT) : wasiapi.pp $(WASIAPIDEPS)
wasiapi$(PPUEXT) : $(WASICOMMONINC)/wasiapi.pp $(WASIAPIDEPS)
$(COMPILER) $< -Fiwasiinc
WASIApi.WASIApi$(PPUEXT) : $(NSOSDIR)/WASIApi.WASIApi.pp $(WASIAPIDEPS)
$(COMPILER) $< -Fiwasiinc
WASIUTILDEPS=$(WASIAPIUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
wasiutil$(PPUEXT) : wasiutil.pp $(WASIUTILDEPS)
wasiutil$(PPUEXT) : $(WASICOMMONINC)/wasiutil.pp $(WASIUTILDEPS)
$(COMPILER) $<
WASIApi.WASIUtil$(PPUEXT) : $(NSOSDIR)/WASIApi.WASIUtil.pp $(WASIUTILDEPS)
$(COMPILER) $<

7
rtl/wasip1threads/Makefile.fpc
View File

@ -41,6 +41,9 @@ PROCINC=../$(CPU_TARGET)
UNITPREFIX=rtl
SYSINIT_UNITS=si_prc si_dll
RESUNIT=$(FPINTRESUNIT)
SYSUTILSDIR=$(WASICOMMONINC)
CLASSESDIR=$(WASICOMMONINC)
RTLDEFSINCDIR=$(WASICOMMONINC)
# Paths
OBJPASDIR=$(RTL)/objpas
# Insert exception handler in system unit
@ -111,7 +114,7 @@ Wasm.Semaphore$(PPUEXT) : $(NSDIR)/wasm32/Wasm.Semaphore.pp $(WASMSEMDEPS)
WASIAPIDEPS=$(WASICOMMONINC)/wasiinc/wasitypes.inc $(WASICOMMONINC)/wasiinc/wasiprocs.inc $(SYSTEMUNIT)$(PPUEXT)
wasiapi$(PPUEXT) : wasiapi.pp $(WASIAPIDEPS)
wasiapi$(PPUEXT) : $(WASICOMMONINC)/wasiapi.pp $(WASIAPIDEPS)
$(COMPILER) $< -Fiwasiinc
WASIApi.WASIApi$(PPUEXT) : $(NSOSDIR)/WASIApi.WASIApi.pp $(WASIAPIDEPS)
@ -123,7 +126,7 @@ WASIApi.WASIApi$(PPUEXT) : $(NSOSDIR)/WASIApi.WASIApi.pp $(WASIAPIDEPS)
WASIUTILDEPS=$(WASIAPIUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
wasiutil$(PPUEXT) : wasiutil.pp $(WASIUTILDEPS)
wasiutil$(PPUEXT) : $(WASICOMMONINC)/wasiutil.pp $(WASIUTILDEPS)
$(COMPILER) $<
WASIApi.WASIUtil$(PPUEXT) : $(NSOSDIR)/WASIApi.WASIUtil.pp $(WASIUTILDEPS)