paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-12 16:09:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Add support for libraries with C linking under Haiku

Browse Source 
Patch by Olivier, mantis #28558

git-svn-id: trunk@31362 -
This commit is contained in:
marco 2015-08-22 12:23:15 +00:00
parent 70df08d5be
commit f59b88f6f8
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compiler/systems/t_haiku.pas
View File

@ -251,7 +251,13 @@ begin
begin begin
linklibc:=true; linklibc:=true;
cprtobj:='dllprt.o'; cprtobj:='dllprt.o';
end
else if makelib then
begin
// Making a dll with libc linking. Should be always the case under Haiku.
cprtobj:='dllcprt0';
end; end;
if linklibc then if linklibc then
prtobj:=cprtobj; prtobj:=cprtobj;

5
rtl/haiku/Makefile.fpc
View File

@ -6,7 +6,7 @@
main=rtl main=rtl
[target] [target]
loaders=prt0 cprt0 func dllprt loaders=prt0 cprt0 dllcprt0 func dllprt
units=system uuchar baseunix unixtype ctypes objpas macpas iso7185 strings \ units=system uuchar baseunix unixtype ctypes objpas macpas iso7185 strings \
# beos \ # beos \
errors dos dl \ errors dos dl \
@ -99,6 +99,9 @@ prt0$(OEXT) : $(CPU_TARGET)/prt0.as
cprt0$(OEXT) : $(CPU_TARGET)/cprt0.as cprt0$(OEXT) : $(CPU_TARGET)/cprt0.as
$(AS) -o $(UNITTARGETDIRPREFIX)cprt0$(OEXT) $(CPU_TARGET)/cprt0.as $(AS) -o $(UNITTARGETDIRPREFIX)cprt0$(OEXT) $(CPU_TARGET)/cprt0.as
dllcprt0$(OEXT) : $(CPU_TARGET)/dllcprt0.as
$(AS) -o $(UNITTARGETDIRPREFIX)dllcprt0$(OEXT) $(CPU_TARGET)/dllcprt0.as
func$(OEXT) : $(CPU_TARGET)/func.as func$(OEXT) : $(CPU_TARGET)/func.as
$(AS) -o $(UNITTARGETDIRPREFIX)func$(OEXT) $(CPU_TARGET)/func.as $(AS) -o $(UNITTARGETDIRPREFIX)func$(OEXT) $(CPU_TARGET)/func.as