From 219b34e03e7958c2dfd27745e3d0bc88fe68f579 Mon Sep 17 00:00:00 2001 From: Tomas Hajny <hajny@freepascal.org> Date: Sun, 22 Feb 2004 15:08:19 +0000 Subject: [PATCH] * Makefiles regenerated --- Makefile | 10 +++++++++- compiler/Makefile | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e9af878850..31f30a246f 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2004/01/05] +# Don't edit, this file is generated by FPCMake Version 1.1 [2004/02/22] # default: help MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom @@ -184,11 +184,14 @@ override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR:=$(FPCDIR)/.. ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) +override FPCDIR:=$(BASEDIR) +ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),) override FPCDIR=c:/pp endif endif endif endif +endif ifndef CROSSDIR CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET) endif @@ -1048,6 +1051,11 @@ ifeq ($(CPU_TARGET),x86_64) REQUIRE_PACKAGES_RTL=1 endif endif +ifeq ($(OS_TARGET),linux) +ifeq ($(CPU_TARGET),arm) +REQUIRE_PACKAGES_RTL=1 +endif +endif ifeq ($(OS_TARGET),go32v2) ifeq ($(CPU_TARGET),i386) REQUIRE_PACKAGES_RTL=1 diff --git a/compiler/Makefile b/compiler/Makefile index d6e7825063..69685fdaff 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2004/02/07] +# Don't edit, this file is generated by FPCMake Version 1.1 [2004/02/22] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom