* small makefile fix introduced with 64-bit port?

git-svn-id: trunk@12797 -
This commit is contained in:
marco 2009-02-25 22:24:08 +00:00
parent 8a253dde71
commit 3265ce1aa1
2 changed files with 10 additions and 13 deletions

View File

@ -1,5 +1,5 @@
#
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/10/22]
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2009/02/09]
#
default: all
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@ -274,6 +274,7 @@ BSDINC=$(RTL)/bsd
BSDPROCINC=$(BSDINC)/$(CPU_TARGET)
UNIXINC=$(RTL)/unix
UNITPREFIX=rtl
CPU_UNITS=
ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
SYSTEMUNIT=system
override FPCOPT+=-dNOMOUSE
@ -282,15 +283,11 @@ else
SYSTEMUNIT=sysbsd
override FPCOPT+=-dUNIX -dNOMOUSE
endif
ifeq ($(CPU_TARGET),i386)
ifeq ($(ARCH),i386)
CPU_UNITS=x86 ports cpu mmx
else
CPU_UNITS=
endif
ifeq ($(CPU_TARGET),x86_64)
ifeq ($(ARCH),x86_64)
CPU_UNITS=x86 ports
else
CPU_UNITS=
endif
ifdef RELEASE
override FPCOPT+=-Ur
@ -2690,6 +2687,7 @@ sysconst$(PPUEXT) : $(OBJPASDIR)/sysconst.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUE
$(COMPILER) $(OBJPASDIR)/sysconst.pp
macpas$(PPUEXT) : $(INC)/macpas.pp objpas$(PPUEXT) math$(PPUEXT)
$(COMPILER) $(INC)/macpas.pp $(REDIR)
x86$(PPUEXT) : $(UNIXINC)/x86.pp $(SYSTEMUNIT)$(PPUEXT)
cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT)
mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
getopts$(PPUEXT) : $(INC)/getopts.pp $(SYSTEMUNIT)$(PPUEXT)

View File

@ -58,6 +58,7 @@ BSDINC=$(RTL)/bsd
BSDPROCINC=$(BSDINC)/$(CPU_TARGET)
UNIXINC=$(RTL)/unix
UNITPREFIX=rtl
CPU_UNITS=
ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
SYSTEMUNIT=system
@ -68,16 +69,12 @@ SYSTEMUNIT=sysbsd
override FPCOPT+=-dUNIX -dNOMOUSE
endif
ifeq ($(CPU_TARGET),i386)
ifeq ($(ARCH),i386)
CPU_UNITS=x86 ports cpu mmx
else
CPU_UNITS=
endif
ifeq ($(CPU_TARGET),x86_64)
ifeq ($(ARCH),x86_64)
CPU_UNITS=x86 ports
else
CPU_UNITS=
endif
@ -224,6 +221,8 @@ macpas$(PPUEXT) : $(INC)/macpas.pp objpas$(PPUEXT) math$(PPUEXT)
# Other system-independent RTL Units
#
x86$(PPUEXT) : $(UNIXINC)/x86.pp $(SYSTEMUNIT)$(PPUEXT)
cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT)
mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)