paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-14 11:29:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fixed

Browse Source
This commit is contained in:
marco 2003-09-15 20:11:06 +00:00
parent 08eb5ac89f
commit cf0c2af370
2 changed files with 182 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

204
compiler/Makefile
View File

@ -1,8 +1,8 @@
# #
# Don't edit, this file is generated by FPCMake Version 1.1 [2002/04/30] # Don't edit, this file is generated by FPCMake Version 1.1 [2003/08/10]
# #
default: all default: all
MAKEFILETARGETS=linux MAKEFILETARGETS=freebsd
override PATH:=$(subst \,/,$(PATH)) override PATH:=$(subst \,/,$(PATH))
ifeq ($(findstring ;,$(PATH)),) ifeq ($(findstring ;,$(PATH)),)
inUnix=1 inUnix=1
@ -32,7 +32,7 @@ inOS2=1
endif endif
endif endif
else else
ifneq ($(findstring cygwin,$(MACHTYPE)),) ifneq ($(findstring cygdrive,$(PATH)),)
inCygWin=1 inCygWin=1
endif endif
endif endif
@ -42,6 +42,9 @@ endif
ifeq ($(OS_TARGET),netbsd) ifeq ($(OS_TARGET),netbsd)
BSDhier=1 BSDhier=1
endif endif
ifeq ($(OS_TARGET),openbsd)
BSDhier=1
endif
ifdef inUnix ifdef inUnix
BATCHEXT=.sh BATCHEXT=.sh
else else
@ -55,6 +58,9 @@ ifdef inUnix
PATHSEP=/ PATHSEP=/
else else
PATHSEP:=$(subst /,\,/) PATHSEP:=$(subst /,\,/)
ifdef inCygWin
PATHSEP=/
endif
endif endif
ifdef PWD ifdef PWD
BASEDIR:=$(subst \,/,$(shell $(PWD))) BASEDIR:=$(subst \,/,$(shell $(PWD)))
@ -105,37 +111,38 @@ endif
override FPC:=$(subst $(SRCEXEEXT),,$(FPC)) override FPC:=$(subst $(SRCEXEEXT),,$(FPC))
override FPC:=$(subst \,/,$(FPC))$(SRCEXEEXT) override FPC:=$(subst \,/,$(FPC))$(SRCEXEEXT)
ifndef FPC_VERSION ifndef FPC_VERSION
FPC_VERSION:=$(shell $(FPC) -iV) FPC_COMPILERINFO:=$(shell $(FPC) -iVSPTPSOTO)
FPC_VERSION:=$(word 1,$(FPC_COMPILERINFO))
endif endif
export FPC FPC_VERSION export FPC FPC_VERSION FPC_COMPILERINFO
unexport CHECKDEPEND ALLDEPENDENCIES unexport CHECKDEPEND ALLDEPENDENCIES
ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
ifndef CPU_SOURCE
CPU_SOURCE:=$(word 1,$(COMPILERINFO))
endif
ifndef CPU_TARGET ifndef CPU_TARGET
CPU_TARGET:=$(word 2,$(COMPILERINFO)) ifdef CPU_TARGET_DEFAULT
CPU_TARGET=$(CPU_TARGET_DEFAULT)
endif endif
ifndef OS_SOURCE
OS_SOURCE:=$(word 3,$(COMPILERINFO))
endif endif
ifndef OS_TARGET ifndef OS_TARGET
OS_TARGET:=$(word 4,$(COMPILERINFO)) ifdef OS_TARGET_DEFAULT
OS_TARGET=$(OS_TARGET_DEFAULT)
endif
endif
ifneq ($(words $(FPC_COMPILERINFO)),5)
FPC_COMPILERINFO+=$(shell $(FPC) -iSP)
FPC_COMPILERINFO+=$(shell $(FPC) -iTP)
FPC_COMPILERINFO+=$(shell $(FPC) -iSO)
FPC_COMPILERINFO+=$(shell $(FPC) -iTO)
endif endif
else
ifndef CPU_SOURCE ifndef CPU_SOURCE
CPU_SOURCE:=$(shell $(FPC) -iSP) CPU_SOURCE:=$(word 2,$(FPC_COMPILERINFO))
endif endif
ifndef CPU_TARGET ifndef CPU_TARGET
CPU_TARGET:=$(shell $(FPC) -iTP) CPU_TARGET:=$(word 3,$(FPC_COMPILERINFO))
endif endif
ifndef OS_SOURCE ifndef OS_SOURCE
OS_SOURCE:=$(shell $(FPC) -iSO) OS_SOURCE:=$(word 4,$(FPC_COMPILERINFO))
endif endif
ifndef OS_TARGET ifndef OS_TARGET
OS_TARGET:=$(shell $(FPC) -iTO) OS_TARGET:=$(word 5,$(FPC_COMPILERINFO))
endif
endif endif
FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET) FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)
FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE) FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)
@ -331,9 +338,15 @@ endif
ifeq ($(OS_TARGET),netbsd) ifeq ($(OS_TARGET),netbsd)
UNIXINSTALLDIR=1 UNIXINSTALLDIR=1
endif endif
ifeq ($(OS_TARGET),openbsd)
UNIXINSTALLDIR=1
endif
ifeq ($(OS_TARGET),sunos) ifeq ($(OS_TARGET),sunos)
UNIXINSTALLDIR=1 UNIXINSTALLDIR=1
endif endif
ifeq ($(OS_TARGET),qnx)
UNIXINSTALLDIR=1
endif
else else
ifeq ($(OS_SOURCE),linux) ifeq ($(OS_SOURCE),linux)
UNIXINSTALLDIR=1 UNIXINSTALLDIR=1
@ -344,9 +357,15 @@ endif
ifeq ($(OS_SOURCE),netbsd) ifeq ($(OS_SOURCE),netbsd)
UNIXINSTALLDIR=1 UNIXINSTALLDIR=1
endif endif
ifeq ($(OS_SOURCE),openbsd)
UNIXINSTALLDIR=1
endif
ifeq ($(OS_TARGET),sunos) ifeq ($(OS_TARGET),sunos)
UNIXINSTALLDIR=1 UNIXINSTALLDIR=1
endif endif
ifeq ($(OS_TARGET),qnx)
UNIXINSTALLDIR=1
endif
endif endif
ifndef INSTALL_PREFIX ifndef INSTALL_PREFIX
ifdef PREFIX ifdef PREFIX
@ -508,6 +527,103 @@ SHAREDLIBEXT=.so
STATICLIBPREFIX=libp STATICLIBPREFIX=libp
RSTEXT=.rst RSTEXT=.rst
FPCMADE=fpcmade FPCMADE=fpcmade
ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
ifeq ($(OS_TARGET),go32v1)
STATICLIBPREFIX=
FPCMADE=fpcmade.v1
PACKAGESUFFIX=v1
endif
ifeq ($(OS_TARGET),go32v2)
STATICLIBPREFIX=
FPCMADE=fpcmade.dos
ZIPSUFFIX=go32
endif
ifeq ($(OS_TARGET),linux)
EXEEXT=
HASSHAREDLIB=1
FPCMADE=fpcmade.lnx
ZIPSUFFIX=linux
endif
ifeq ($(OS_TARGET),freebsd)
EXEEXT=
HASSHAREDLIB=1
FPCMADE=fpcmade.freebsd
ZIPSUFFIX=freebsd
endif
ifeq ($(OS_TARGET),netbsd)
EXEEXT=
HASSHAREDLIB=1
FPCMADE=fpcmade.netbsd
ZIPSUFFIX=netbsd
endif
ifeq ($(OS_TARGET),openbsd)
EXEEXT=
HASSHAREDLIB=1
FPCMADE=fpcmade.openbsd
ZIPSUFFIX=openbsd
endif
ifeq ($(OS_TARGET),win32)
SHAREDLIBEXT=.dll
FPCMADE=fpcmade.w32
ZIPSUFFIX=w32
endif
ifeq ($(OS_TARGET),os2)
AOUTEXT=.out
STATICLIBPREFIX=
SHAREDLIBEXT=.dll
FPCMADE=fpcmade.os2
ZIPSUFFIX=os2
ECHO=echo
endif
ifeq ($(OS_TARGET),emx)
AOUTEXT=.out
STATICLIBPREFIX=
SHAREDLIBEXT=.dll
FPCMADE=fpcmade.emx
ZIPSUFFIX=emx
ECHO=echo
endif
ifeq ($(OS_TARGET),amiga)
EXEEXT=
SHAREDLIBEXT=.library
FPCMADE=fpcmade.amg
endif
ifeq ($(OS_TARGET),atari)
EXEEXT=.ttp
FPCMADE=fpcmade.ata
endif
ifeq ($(OS_TARGET),beos)
EXEEXT=
FPCMADE=fpcmade.be
ZIPSUFFIX=be
endif
ifeq ($(OS_TARGET),sunos)
EXEEXT=
FPCMADE=fpcmade.sun
ZIPSUFFIX=sun
endif
ifeq ($(OS_TARGET),qnx)
EXEEXT=
FPCMADE=fpcmade.qnx
ZIPSUFFIX=qnx
endif
ifeq ($(OS_TARGET),netware)
EXEEXT=.nlm
STATICLIBPREFIX=
FPCMADE=fpcmade.nw
ZIPSUFFIX=nw
endif
ifeq ($(OS_TARGET),macos)
EXEEXT=
FPCMADE=fpcmade.mcc
endif
ifeq ($(OS_TARGET),darwin)
EXEEXT=
HASSHAREDLIB=1
FPCMADE=fpcmade.darwin
ZIPSUFFIX=darwin
endif
else
ifeq ($(OS_TARGET),go32v1) ifeq ($(OS_TARGET),go32v1)
PPUEXT=.pp1 PPUEXT=.pp1
OEXT=.o1 OEXT=.o1
@ -542,6 +658,12 @@ HASSHAREDLIB=1
FPCMADE=fpcmade.netbsd FPCMADE=fpcmade.netbsd
ZIPSUFFIX=netbsd ZIPSUFFIX=netbsd
endif endif
ifeq ($(OS_TARGET),openbsd)
EXEEXT=
HASSHAREDLIB=1
FPCMADE=fpcmade.openbsd
ZIPSUFFIX=openbsd
endif
ifeq ($(OS_TARGET),win32) ifeq ($(OS_TARGET),win32)
PPUEXT=.ppw PPUEXT=.ppw
OEXT=.ow OEXT=.ow
@ -567,7 +689,7 @@ ECHO=echo
endif endif
ifeq ($(OS_TARGET),amiga) ifeq ($(OS_TARGET),amiga)
EXEEXT= EXEEXT=
PPUEXT=.ppa PPUEXT=.ppu
ASMEXT=.asm ASMEXT=.asm
OEXT=.o OEXT=.o
SMARTEXT=.sl SMARTEXT=.sl
@ -576,7 +698,7 @@ SHAREDLIBEXT=.library
FPCMADE=fpcmade.amg FPCMADE=fpcmade.amg
endif endif
ifeq ($(OS_TARGET),atari) ifeq ($(OS_TARGET),atari)
PPUEXT=.ppt PPUEXT=.ppu
ASMEXT=.s ASMEXT=.s
OEXT=.o OEXT=.o
SMARTEXT=.sl SMARTEXT=.sl
@ -616,8 +738,8 @@ ZIPSUFFIX=qnx
endif endif
ifeq ($(OS_TARGET),netware) ifeq ($(OS_TARGET),netware)
STATICLIBPREFIX= STATICLIBPREFIX=
PPUEXT=.ppn PPUEXT=.ppu
OEXT=.on OEXT=.o
ASMEXT=.s ASMEXT=.s
SMARTEXT=.sl SMARTEXT=.sl
STATICLIBEXT=.a STATICLIBEXT=.a
@ -626,6 +748,16 @@ FPCMADE=fpcmade.nw
ZIPSUFFIX=nw ZIPSUFFIX=nw
EXEEXT=.nlm EXEEXT=.nlm
endif endif
ifeq ($(OS_TARGET),macos)
PPUEXT=.ppu
ASMEXT=.s
OEXT=.o
SMARTEXT=.sl
STATICLIBEXT=.a
EXEEXT=
FPCMADE=fpcmade.mcc
endif
endif
ifndef ECHO ifndef ECHO
ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH)))) ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
ifeq ($(ECHO),) ifeq ($(ECHO),)
@ -847,10 +979,17 @@ else
TAROPT=vz TAROPT=vz
TAREXT=.tar.gz TAREXT=.tar.gz
endif endif
override REQUIRE_PACKAGES=rtl override REQUIRE_PACKAGES=rtl rtl
ifeq ($(OS_TARGET),linux) ifeq ($(OS_TARGET),freebsd)
ifeq ($(CPU_TARGET),i386)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
endif endif
endif
ifeq ($(OS_TARGET),freebsd)
ifeq ($(CPU_TARGET),m68k)
REQUIRE_PACKAGES_RTL=1
endif
endif
ifdef REQUIRE_PACKAGES_RTL ifdef REQUIRE_PACKAGES_RTL
PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/$(OS_TARGET)/Makefile.fpc,$(PACKAGESDIR)))))) PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/$(OS_TARGET)/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_RTL),) ifneq ($(PACKAGEDIR_RTL),)
@ -883,6 +1022,9 @@ endif
ifneq ($(OS_TARGET),$(OS_SOURCE)) ifneq ($(OS_TARGET),$(OS_SOURCE))
override FPCOPT+=-T$(OS_TARGET) override FPCOPT+=-T$(OS_TARGET)
endif endif
ifeq ($(OS_SOURCE),openbsd)
override FPCOPT+=-FD$(NEW_BINUTILS_PATH)
endif
ifdef UNITDIR ifdef UNITDIR
override FPCOPT+=$(addprefix -Fu,$(UNITDIR)) override FPCOPT+=$(addprefix -Fu,$(UNITDIR))
endif endif
@ -964,6 +1106,11 @@ override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)
override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX) override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)
endif endif
endif endif
ifeq ($(OS_TARGET),linux)
ifeq ($(FPC_VERSION),1.0.6)
override FPCOPTDEF+=HASUNIX
endif
endif
ifdef OPT ifdef OPT
override FPCOPT+=$(OPT) override FPCOPT+=$(OPT)
endif endif
@ -982,7 +1129,7 @@ override COMPILER:=$(FPC) $(FPCOPT)
ifeq (,$(findstring -s ,$(COMPILER))) ifeq (,$(findstring -s ,$(COMPILER)))
EXECPPAS= EXECPPAS=
else else
ifeq ($(OS_SOURCE),$(OS_TARGET)) ifeq ($(FULL_SOURCE),$(FULL_TARGET))
EXECPPAS:=@$(PPAS) EXECPPAS:=@$(PPAS)
endif endif
endif endif
@ -1225,6 +1372,7 @@ fpc_baseinfo:
@$(ECHO) Rm........ $(RMPROG) @$(ECHO) Rm........ $(RMPROG)
@$(ECHO) GInstall.. $(GINSTALL) @$(ECHO) GInstall.. $(GINSTALL)
@$(ECHO) Echo...... $(ECHO) @$(ECHO) Echo...... $(ECHO)
@$(ECHO) Shell..... $(SHELL)
@$(ECHO) Date...... $(DATE) @$(ECHO) Date...... $(DATE)
@$(ECHO) FPCMake... $(FPCMAKE) @$(ECHO) FPCMake... $(FPCMAKE)
@$(ECHO) PPUMove... $(PPUMOVE) @$(ECHO) PPUMove... $(PPUMOVE)
@ -1355,7 +1503,7 @@ distinstall: fpc_distinstall
zipinstall: fpc_zipinstall zipinstall: fpc_zipinstall
zipsourceinstall: fpc_zipsourceinstall zipsourceinstall: fpc_zipsourceinstall
zipexampleinstall: fpc_zipexampleinstall $(addsuffix _zipexampleinstall,$(TARGET_DIRS)) zipexampleinstall: fpc_zipexampleinstall $(addsuffix _zipexampleinstall,$(TARGET_DIRS))
zipdistinstall: fpc_zipdistinstall $(addsuffix _zipdistinstall,$(TARGET_DIRS)) zipdistinstall: fpc_zipdistinstall
cleanall: $(addsuffix _cleanall,$(TARGET_DIRS)) cleanall: $(addsuffix _cleanall,$(TARGET_DIRS))
info: fpc_info info: fpc_info
makefiles: fpc_makefiles makefiles: fpc_makefiles

8
compiler/globals.pas
View File

@ -975,10 +975,11 @@ implementation
{$ifdef hasunix} {$ifdef hasunix}
{$IFDEF VER1_0} {$IFDEF VER1_0}
FStat (F,Info); FStat (F,Info);
L:=Info.st_Mtime;
{$ELSE} {$ELSE}
FPFStat (F,Info); FPFStat (F,Info);
L:=Info.st_Mtime;
{$ENDIF} {$ENDIF}
L:=Info.Mtime;
{$else} {$else}
GetFTime(f,l); GetFTime(f,l);
{$endif} {$endif}
@ -1678,7 +1679,10 @@ implementation
end. end.
{ {
$Log$ $Log$
Revision 1.99 2003-09-14 20:26:18 marco Revision 1.100 2003-09-15 20:11:06 marco
* fixed
Revision 1.99 2003/09/14 20:26:18 marco
* Unix reform * Unix reform
Revision 1.98 2003/09/14 12:55:06 jonas Revision 1.98 2003/09/14 12:55:06 jonas