summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2>2020-03-29 19:20:03 +0000
committerjonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2>2020-03-29 19:20:03 +0000
commit0b9872cb307cadf29e5b18ef9fcd8633e0fcaca5 (patch)
tree0af86336b2cb06a51ebf52c29b4af022fccbbd5f
parent0e71dd3617e20596e49904af67e0ebb742b04fa2 (diff)
downloadfpc-0b9872cb307cadf29e5b18ef9fcd8633e0fcaca5.tar.gz
* allow FPC 3.2.0 as bootstrap version
git-svn-id: https://svn.freepascal.org/svn/fpc/trunk@44408 3ad0048d-3df7-0310-abae-a5850022a9f2
-rw-r--r--Makefile16
-rw-r--r--Makefile.fpc4
2 files changed, 15 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 07302e29b2..bde5bcfa5b 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
# Don't edit, this file is generated by FPCMake Version 2.0.0
#
default: help
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin aarch64-android wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-embedded
+MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-haiku x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin aarch64-android wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded xtensa-embedded xtensa-FreeRTOS
BSDs = freebsd netbsd openbsd darwin dragonfly
UNIXs = linux $(BSDs) solaris qnx haiku aix
LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari
@@ -331,8 +331,8 @@ endif
endif
override PACKAGE_NAME=fpc
override PACKAGE_VERSION=3.3.1
-REQUIREDVERSION=3.0.4
-REQUIREDVERSION2=3.0.2
+REQUIREDVERSION=3.2.0
+REQUIREDVERSION2=3.0.4
ifndef inOS2
override FPCDIR:=$(BASEDIR)
export FPCDIR
@@ -769,6 +769,9 @@ endif
ifeq ($(FULL_TARGET),xtensa-embedded)
override TARGET_DIRS+=compiler rtl utils packages installer
endif
+ifeq ($(FULL_TARGET),xtensa-FreeRTOS)
+override TARGET_DIRS+=compiler rtl utils packages installer
+endif
override INSTALL_FPCPACKAGE=y
ifdef REQUIRE_UNITSDIR
override UNITSDIR+=$(REQUIRE_UNITSDIR)
@@ -2608,6 +2611,13 @@ TARGET_DIRS_UTILS=1
TARGET_DIRS_PACKAGES=1
TARGET_DIRS_INSTALLER=1
endif
+ifeq ($(FULL_TARGET),xtensa-FreeRTOS)
+TARGET_DIRS_COMPILER=1
+TARGET_DIRS_RTL=1
+TARGET_DIRS_UTILS=1
+TARGET_DIRS_PACKAGES=1
+TARGET_DIRS_INSTALLER=1
+endif
ifdef TARGET_DIRS_COMPILER
compiler_all:
$(MAKE) -C compiler all
diff --git a/Makefile.fpc b/Makefile.fpc
index 2a2c512582..84f55e7323 100644
--- a/Makefile.fpc
+++ b/Makefile.fpc
@@ -20,8 +20,8 @@ fpcdir=.
rule=help
[prerules]
-REQUIREDVERSION=3.0.4
-REQUIREDVERSION2=3.0.2
+REQUIREDVERSION=3.2.0
+REQUIREDVERSION2=3.0.4
# make versions < 3.77 (OS2 version) are buggy