mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-04-06 00:47:52 +02:00
* revs 43341 (Solaris makefile) ,43971 (ismanagedtype usage 3.2.x ifdef in
fgl) git-svn-id: branches/fixes_3_2@44091 -
This commit is contained in:
parent
cbe9654b04
commit
1bf341f0ff
@ -970,11 +970,7 @@ end;
|
||||
class function TFPGList.ItemIsManaged: Boolean;
|
||||
begin
|
||||
{$IFNDEF VER3_0}
|
||||
{$IFNDEF VER3_2}
|
||||
Result:=IsManagedType(T);
|
||||
{$ELSE}
|
||||
Result:=True; // Fallback to old behaviour
|
||||
{$ENDIF}
|
||||
{$ELSE}
|
||||
Result:=True; // Fallback to old behaviour
|
||||
{$ENDIF}
|
||||
|
@ -2937,9 +2937,11 @@ character$(PPUEXT): sysutils$(PPUEXT) $(OBJPASDIR)/character.pas objpas$(PPUEXT)
|
||||
macpas$(PPUEXT) : $(INC)/macpas.pp objpas$(PPUEXT) math$(PPUEXT)
|
||||
$(COMPILER) $(INC)/macpas.pp $(REDIR)
|
||||
ifneq ($(findstring $(ARCH),x86_64 i386),)
|
||||
cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT)
|
||||
cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) objpas$(PPUEXT)
|
||||
$(COMPILER) $(PROCINC)/cpu.pp
|
||||
else
|
||||
cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT)
|
||||
cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT)
|
||||
$(COMPILER) $(PROCINC)/cpu.pp
|
||||
endif
|
||||
mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
|
||||
$(COMPILER) $(PROCINC)/mmx.pp
|
||||
|
@ -221,9 +221,11 @@ macpas$(PPUEXT) : $(INC)/macpas.pp objpas$(PPUEXT) math$(PPUEXT)
|
||||
#
|
||||
|
||||
ifneq ($(findstring $(ARCH),x86_64 i386),)
|
||||
cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT)
|
||||
cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) objpas$(PPUEXT)
|
||||
$(COMPILER) $(PROCINC)/cpu.pp
|
||||
else
|
||||
cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT)
|
||||
cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT)
|
||||
$(COMPILER) $(PROCINC)/cpu.pp
|
||||
endif
|
||||
|
||||
mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
|
||||
|
Loading…
Reference in New Issue
Block a user