Browse Source

* linux unit is build for bootstrapping

peter 24 years ago
parent
commit
987b7584bd
4 changed files with 21 additions and 6 deletions
  1. 6 1
      rtl/freebsd/Makefile
  2. 7 1
      rtl/freebsd/Makefile.fpc
  3. 4 2
      rtl/linux/Makefile
  4. 4 2
      rtl/linux/Makefile.fpc

+ 6 - 1
rtl/freebsd/Makefile

@@ -132,9 +132,11 @@ UNIXINC=$(RTL)/unix
 UNITPREFIX=rtl
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 SYSTEMUNIT=system
+LINUXUNIT=
 PRT0=prt0
 else
 SYSTEMUNIT=sysbsd
+LINUXUNIT=linux
 override FPCOPT+=-dUNIX
 PRT0=prt0_10
 endif
@@ -143,7 +145,7 @@ GRAPHDIR=$(INC)/graph
 ifndef USELIBGGI
 USELIBGGI=NO
 endif
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas strings unix initc dos crt objects printer sysutils typinfo math varutils cpu mmx getopts heaptrc lineinfo errors sockets gpm ipc terminfo video mouse keyboard console serial
+override TARGET_UNITS+=$(SYSTEMUNIT) objpas strings $(LINUXUNIT) unix initc dos crt objects printer sysutils typinfo math varutils cpu mmx getopts heaptrc lineinfo errors sockets gpm ipc terminfo video mouse keyboard console serial
 override TARGET_LOADERS+=prt0 cprt0
 override TARGET_RSTS+=math varutils
 override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC)
@@ -820,6 +822,9 @@ math$(PPUEXT): $(OBJPASDIR)/math.pp objpas$(PPUEXT) sysutils$(PPUEXT)
 	$(COMPILER) $(OBJPASDIR)/math.pp
 gettext$(PPUEXT): $(OBJPASDIR)/gettext.pp objpas$(PPUEXT) sysutils$(PPUEXT)
 	$(COMPILER) $(OBJPASDIR)/gettext.pp
+varutils$(PPUEXT) : $(OBJPASDIR)/cvarutil.inc $(OBJPASDIR)/varutils.inc \
+		    $(OBJPASDIR)/varutilh.inc varutils.pp
+	$(COMPILER) -I$(OBJPASDIR) $(UNIXINC)/varutils.pp
 cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT)
 mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
 getopts$(PPUEXT) : $(INC)/getopts.pp $(SYSTEMUNIT)$(PPUEXT)

+ 7 - 1
rtl/freebsd/Makefile.fpc

@@ -8,7 +8,7 @@ main=rtl
 [target]
 loaders=prt0 cprt0
 units=$(SYSTEMUNIT) objpas strings \
-      unix initc \
+      $(LINUXUNIT) unix initc \
       dos crt objects printer \
       sysutils typinfo math varutils \
       cpu mmx getopts heaptrc lineinfo \
@@ -48,9 +48,11 @@ UNITPREFIX=rtl
 
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 SYSTEMUNIT=system
+LINUXUNIT=
 PRT0=prt0
 else
 SYSTEMUNIT=sysbsd
+LINUXUNIT=linux
 override FPCOPT+=-dUNIX
 PRT0=prt0_10
 endif
@@ -153,6 +155,10 @@ math$(PPUEXT): $(OBJPASDIR)/math.pp objpas$(PPUEXT) sysutils$(PPUEXT)
 gettext$(PPUEXT): $(OBJPASDIR)/gettext.pp objpas$(PPUEXT) sysutils$(PPUEXT)
         $(COMPILER) $(OBJPASDIR)/gettext.pp
 
+varutils$(PPUEXT) : $(OBJPASDIR)/cvarutil.inc $(OBJPASDIR)/varutils.inc \
+                    $(OBJPASDIR)/varutilh.inc varutils.pp
+        $(COMPILER) -I$(OBJPASDIR) $(UNIXINC)/varutils.pp
+
 #
 # Other system-independent RTL Units
 #

+ 4 - 2
rtl/linux/Makefile

@@ -132,9 +132,11 @@ UNIXINC=$(RTL)/unix
 UNITPREFIX=rtl
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 SYSTEMUNIT=system
+LINUXUNIT=
 PRT0=prt0
 else
 SYSTEMUNIT=syslinux
+LINUXUNIT=linux
 PRT0=prt0_10
 override FPCOPT+=-dUNIX
 endif
@@ -143,10 +145,10 @@ GRAPHDIR=$(INC)/graph
 ifndef USELIBGGI
 USELIBGGI=NO
 endif
-override TARGET_UNITS+=$(SYSTEMUNIT) objpas strings unix ports initc dos crt objects printer graph ggigraph sysutils typinfo math varutils cpu mmx getopts heaptrc lineinfo errors sockets gpm ipc serial terminfo dl dynlibs video mouse keyboard
+override TARGET_UNITS+=$(SYSTEMUNIT) objpas strings $(LINUXUNIT) unix ports initc dos crt objects printer graph ggigraph sysutils typinfo math varutils cpu mmx getopts heaptrc lineinfo errors sockets gpm ipc serial terminfo dl dynlibs video mouse keyboard
 override TARGET_LOADERS+=prt0 cprt0 gprt0 cprt21 gprt21
 override TARGET_RSTS+=math varutils
-override CLEAN_UNITS+=syslinux
+override CLEAN_UNITS+=syslinux linux
 override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(UNIXINC)
 override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(UNIXINC)
 override COMPILER_TARGETDIR+=.

+ 4 - 2
rtl/linux/Makefile.fpc

@@ -8,7 +8,7 @@ main=rtl
 [target]
 loaders=prt0 cprt0 gprt0 cprt21 gprt21
 units=$(SYSTEMUNIT) objpas strings \
-      unix ports initc \
+      $(LINUXUNIT) unix ports initc \
       dos crt objects printer graph ggigraph \
       sysutils typinfo math varutils \
       cpu mmx getopts heaptrc lineinfo \
@@ -20,7 +20,7 @@ rsts=math varutils
 nortl=y
 
 [clean]
-units=syslinux
+units=syslinux linux
 
 [default]
 fpcdir=../..
@@ -52,9 +52,11 @@ UNITPREFIX=rtl
 
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 SYSTEMUNIT=system
+LINUXUNIT=
 PRT0=prt0
 else
 SYSTEMUNIT=syslinux
+LINUXUNIT=linux
 PRT0=prt0_10
 override FPCOPT+=-dUNIX
 endif