paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-20 18:09:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

* better localopt usage

Browse Source
This commit is contained in:
peter 2000-11-13 21:55:08 +00:00
parent 8e0b10a0da
commit a9c4c8d407
2 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
compiler/Makefile
View File

@ -1,5 +1,5 @@
#
# Makefile generated by fpcmake v1.00 [2000/11/08]
# Makefile generated by fpcmake v1.00 [2000/10/27]
#
defaultrule: all
@ -103,25 +103,12 @@ ifndef FPC_VERSION
FPC_VERSION:=$(shell $(FPC) -iV)
endif
export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION FPCOPT
export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
#####################################################################
# Pre Settings
#####################################################################
# Define Unix also for Linux
ifeq ($(OS_TARGET),linux)
ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
override FPCOPT+=-dUNIX
endif
endif
ifeq ($(OS_TARGET),freebsd)
ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
override FPCOPT+=-dUNIX
endif
endif
# Don't export OS_SOURCE because it can change after the first compile
unexport OS_SOURCE FPC_VERSION
@ -167,6 +154,19 @@ endif
# Message files
MSGFILES=$(wildcard error*.msg)
# Define Unix also for Linux
ifeq ($(OS_TARGET),linux)
ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
override LOCALDEF+=-dUNIX
endif
endif
ifeq ($(OS_TARGET),freebsd)
ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
override LOCALDEF+=-dUNIX
endif
endif
#####################################################################
# FPCDIR Setting
#####################################################################
@ -288,7 +288,7 @@ endif
override LOCALOPT+=$(LOCALDEF)
override FPCOPT+=$(LOCALOPT)
override FPCOPT:=$(LOCALOPT)
#####################################################################
# Shell tools

28
compiler/Makefile.fpc
View File

@ -24,19 +24,6 @@ toolupx=1
[presettings]
# Define Unix also for Linux
ifeq ($(OS_TARGET),linux)
ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
override FPCOPT+=-dUNIX
endif
endif
ifeq ($(OS_TARGET),freebsd)
ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
override FPCOPT+=-dUNIX
endif
endif
# Don't export OS_SOURCE because it can change after the first compile
unexport OS_SOURCE FPC_VERSION
@ -83,6 +70,19 @@ endif
# Message files
MSGFILES=$(wildcard error*.msg)
# Define Unix also for Linux
ifeq ($(OS_TARGET),linux)
ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
override LOCALDEF+=-dUNIX
endif
endif
ifeq ($(OS_TARGET),freebsd)
ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
override LOCALDEF+=-dUNIX
endif
endif
[postsettings]
# Default message file
@ -99,7 +99,7 @@ endif
override LOCALOPT+=$(LOCALDEF)
override FPCOPT+=$(LOCALOPT)
override FPCOPT:=$(LOCALOPT)
[rules]