diff options
author | yury <yury@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2018-10-06 09:36:03 +0000 |
---|---|---|
committer | yury <yury@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2018-10-06 09:36:03 +0000 |
commit | c637f4b9ebe55e36677979aa12b2e93492b704f1 (patch) | |
tree | 3fcd8945bf5116ce3b3107a74f209622c608f6b3 /installer | |
parent | e977653ad3145bcd47552b64e798bc9510d1d488 (diff) | |
download | fpc-c637f4b9ebe55e36677979aa12b2e93492b704f1.tar.gz |
* Regenerated makefiles to support aarch64-android.
git-svn-id: https://svn.freepascal.org/svn/fpc/trunk@39863 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'installer')
-rw-r--r-- | installer/Makefile | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/installer/Makefile b/installer/Makefile index 1bab22ccc3..ce2bea1a66 100644 --- a/installer/Makefile +++ b/installer/Makefile @@ -2,7 +2,7 @@ # Don't edit, this file is generated by FPCMake Version 2.0.0 # default: all -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-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim 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 wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-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-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim 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 BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari @@ -288,9 +288,7 @@ else ifeq ($(CPU_TARGET),i386) BINUTILSPREFIX=i686-linux-android- else -ifeq ($(CPU_TARGET),mipsel) -BINUTILSPREFIX=mipsel-linux-android- -endif +BINUTILSPREFIX=$(CPU_TARGET)-linux-android- endif endif endif @@ -639,6 +637,9 @@ endif ifeq ($(FULL_TARGET),aarch64-darwin) override CLEAN_UNITS+=scroll insthelp endif +ifeq ($(FULL_TARGET),aarch64-android) +override CLEAN_UNITS+=scroll insthelp +endif ifeq ($(FULL_TARGET),wasm-wasm) override CLEAN_UNITS+=scroll insthelp endif @@ -955,6 +956,9 @@ endif ifeq ($(FULL_TARGET),aarch64-darwin) override COMPILER_UNITDIR+=../ide endif +ifeq ($(FULL_TARGET),aarch64-android) +override COMPILER_UNITDIR+=../ide +endif ifeq ($(FULL_TARGET),wasm-wasm) override COMPILER_UNITDIR+=../ide endif @@ -2635,6 +2639,18 @@ REQUIRE_PACKAGES_FV=1 REQUIRE_PACKAGES_UNZIP=1 REQUIRE_PACKAGES_RTL-EXTRA=1 endif +ifeq ($(FULL_TARGET),aarch64-android) +REQUIRE_PACKAGES_RTL=1 +REQUIRE_PACKAGES_PASZLIB=1 +REQUIRE_PACKAGES_FCL-PROCESS=1 +REQUIRE_PACKAGES_HASH=1 +REQUIRE_PACKAGES_LIBTAR=1 +REQUIRE_PACKAGES_FPMKUNIT=1 +REQUIRE_PACKAGES_RTL-CONSOLE=1 +REQUIRE_PACKAGES_FV=1 +REQUIRE_PACKAGES_UNZIP=1 +REQUIRE_PACKAGES_RTL-EXTRA=1 +endif ifeq ($(FULL_TARGET),wasm-wasm) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 |