mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-08-16 13:39:26 +02:00
* don't set FPC to PPNEW because PPNEW gets deleted first
This commit is contained in:
parent
b3c72a630a
commit
6b648f5dde
@ -29,7 +29,6 @@ PPNEW=$(BASEDIR)/compiler/ppc386$(SRCEXEEXT)
|
|||||||
# Check if there is already a ppc386 binary in compiler, then
|
# Check if there is already a ppc386 binary in compiler, then
|
||||||
# we will use that version for target and version info
|
# we will use that version for target and version info
|
||||||
ifneq ($(wildcard $(PPNEW)),)
|
ifneq ($(wildcard $(PPNEW)),)
|
||||||
override FPC:=$(PPNEW)
|
|
||||||
override FPC_VERSION:=$(shell $(PPNEW) -iV)
|
override FPC_VERSION:=$(shell $(PPNEW) -iV)
|
||||||
override OS_TARGET:=$(shell $(PPNEW) -iTO)
|
override OS_TARGET:=$(shell $(PPNEW) -iTO)
|
||||||
override CPU_TARGET:=$(shell $(PPNEW) -iTP)
|
override CPU_TARGET:=$(shell $(PPNEW) -iTP)
|
||||||
@ -478,7 +477,7 @@ ifneq ($(wildcard $(CVSINSTALL)/fpc.spec),)
|
|||||||
|
|
||||||
.PHONY: rpmcopy rpm
|
.PHONY: rpmcopy rpm
|
||||||
|
|
||||||
RPMFPCVERSION:=$(shell grep 'define fpcversion' $(CVSINSTALL)/fpc.spec | awk '{ print $$3 }')
|
RPMFPCVERSION:=$(shell grep 'define fpcversion' $(CVSINSTALL)/fpc.spec | awk '{ print $$2 }')
|
||||||
|
|
||||||
REDHATDIR=/usr/src/redhat
|
REDHATDIR=/usr/src/redhat
|
||||||
RPMSOURCESDIR:=$(REDHATDIR)/SOURCES
|
RPMSOURCESDIR:=$(REDHATDIR)/SOURCES
|
||||||
|
Loading…
Reference in New Issue
Block a user