瀏覽代碼

* revs 43341 (Solaris makefile) ,43971 (ismanagedtype usage 3.2.x ifdef in
fgl)

git-svn-id: branches/fixes_3_2@44091 -

marco 5 年之前
父節點
當前提交
1bf341f0ff
共有 3 個文件被更改,包括 8 次插入8 次删除
  1. 0 4
      rtl/objpas/fgl.pp
  2. 4 2
      rtl/solaris/Makefile
  3. 4 2
      rtl/solaris/Makefile.fpc

+ 0 - 4
rtl/objpas/fgl.pp

@@ -970,11 +970,7 @@ end;
 class function TFPGList.ItemIsManaged: Boolean;
 class function TFPGList.ItemIsManaged: Boolean;
 begin
 begin
 {$IFNDEF VER3_0}
 {$IFNDEF VER3_0}
-{$IFNDEF VER3_2}
   Result:=IsManagedType(T);
   Result:=IsManagedType(T);
-{$ELSE}  
-  Result:=True; // Fallback to old behaviour  
-{$ENDIF}
 {$ELSE}
 {$ELSE}
   Result:=True; // Fallback to old behaviour  
   Result:=True; // Fallback to old behaviour  
 {$ENDIF}
 {$ENDIF}

+ 4 - 2
rtl/solaris/Makefile

@@ -2937,9 +2937,11 @@ character$(PPUEXT): sysutils$(PPUEXT) $(OBJPASDIR)/character.pas objpas$(PPUEXT)
 macpas$(PPUEXT) : $(INC)/macpas.pp objpas$(PPUEXT) math$(PPUEXT)
 macpas$(PPUEXT) : $(INC)/macpas.pp objpas$(PPUEXT) math$(PPUEXT)
 	$(COMPILER) $(INC)/macpas.pp $(REDIR)
 	$(COMPILER) $(INC)/macpas.pp $(REDIR)
 ifneq ($(findstring $(ARCH),x86_64 i386),)
 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
 else
-cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT)
+cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT)
+	$(COMPILER) $(PROCINC)/cpu.pp
 endif
 endif
 mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
 mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
 	$(COMPILER) $(PROCINC)/mmx.pp
 	$(COMPILER) $(PROCINC)/mmx.pp

+ 4 - 2
rtl/solaris/Makefile.fpc

@@ -221,9 +221,11 @@ macpas$(PPUEXT) : $(INC)/macpas.pp objpas$(PPUEXT) math$(PPUEXT)
 #
 #
 
 
 ifneq ($(findstring $(ARCH),x86_64 i386),)
 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
 else
-cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT)
+cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT)
+	$(COMPILER) $(PROCINC)/cpu.pp
 endif
 endif
 
 
 mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
 mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)