Skip to content

Commit

Permalink
* target classic MacOS builds again
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.freepascal.org/svn/fpc/trunk@39156 3ad0048d-3df7-0310-abae-a5850022a9f2
  • Loading branch information
FPK committed May 31, 2018
1 parent 0f74ffa commit 86ef50f
Show file tree
Hide file tree
Showing 7 changed files with 543 additions and 121 deletions.
4 changes: 2 additions & 2 deletions Makefile
@@ -1,5 +1,5 @@
#
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2018-04-12 rev 38745]
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2018-04-29 rev 38866]
#
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-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
Expand Down Expand Up @@ -471,7 +471,7 @@ BUILDOPTS=FPC=$(PPNEW) FPCFPMAKE=$(FPCFPMAKENEW) RELEASE=1 'OPT=$(OPTNEW)'
INSTALLOPTS=FPC=$(PPNEW) ZIPDESTDIR=$(BASEDIR) FPCMAKE=$(FPCMAKENEW)
BuildOnlyBaseCPUs=jvm
ifneq ($(wildcard utils),)
NOUTILSTARGETS=embedded gba nds msdos win16 $(BuildOnlyBaseCPUs)
NOUTILSTARGETS=embedded gba nds msdos win16 macos $(BuildOnlyBaseCPUs)
ifeq ($(findstring $(OS_TARGET),$(NOUTILSTARGETS)),)
ifdef BUILDFULLNATIVE
UTILS=1
Expand Down
2 changes: 1 addition & 1 deletion Makefile.fpc
Expand Up @@ -199,7 +199,7 @@ INSTALLOPTS=FPC=$(PPNEW) ZIPDESTDIR=$(BASEDIR) FPCMAKE=$(FPCMAKENEW)
BuildOnlyBaseCPUs=jvm

ifneq ($(wildcard utils),)
NOUTILSTARGETS=embedded gba nds msdos win16 $(BuildOnlyBaseCPUs)
NOUTILSTARGETS=embedded gba nds msdos win16 macos $(BuildOnlyBaseCPUs)
ifeq ($(findstring $(OS_TARGET),$(NOUTILSTARGETS)),)
ifdef BUILDFULLNATIVE
UTILS=1
Expand Down
5 changes: 4 additions & 1 deletion compiler/Makefile
@@ -1,5 +1,5 @@
#
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2018-04-12 rev 38745]
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2018-04-29 rev 38866]
#
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
Expand Down Expand Up @@ -572,6 +572,9 @@ endif
ifeq ($(OS_TARGET),win16)
NoNativeBinaries=1
endif
ifeq ($(OS_TARGET),macos)
NoNativeBinaries=1
endif
ifeq ($(NoNativeBinaries),1)
override EXEEXT=$(SRCEXEEXT)
CROSSINSTALL=1
Expand Down
5 changes: 4 additions & 1 deletion compiler/Makefile.fpc
Expand Up @@ -348,8 +348,11 @@ endif
ifeq ($(OS_TARGET),win16)
NoNativeBinaries=1
endif
ifeq ($(OS_TARGET),macos)
NoNativeBinaries=1
endif

# Allow install for jvm
# Allow install for jvm
ifeq ($(NoNativeBinaries),1)
override EXEEXT=$(SRCEXEEXT)
# In those cases, installation in a cross-installation
Expand Down

0 comments on commit 86ef50f

Please sign in to comment.