paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-15 19:29:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

* better fix for not automatically adding cross binutils prefixes for

Browse Source 
darwin to darwin cross compilation (keeps CROSSCOMPILE=1 now, so other
    CROSSCOMPILE-related changes are still done)

git-svn-id: trunk@11233 -
This commit is contained in:
Jonas Maebe 2008-06-15 15:40:24 +00:00
parent 68a4c0347a
commit 010246b1ae
2 changed files with 409 additions and 409 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

802
utils/fpcm/fpcmake.inc
View File

File diff suppressed because it is too large Load Diff

16
utils/fpcm/fpcmake.ini
View File

@ -276,15 +276,9 @@ SOURCESUFFIX=$(FULL_SOURCE)
endif endif
# Cross compile flag # Cross compile flag
ifeq ($(OS_TARGET),darwin)
ifneq ($(OS_SOURCE),darwin)
CROSSCOMPILE=1
endif
else
ifneq ($(FULL_TARGET),$(FULL_SOURCE)) ifneq ($(FULL_TARGET),$(FULL_SOURCE))
CROSSCOMPILE=1 CROSSCOMPILE=1
endif endif
endif
# Check if the Makefile supports this target, but not # Check if the Makefile supports this target, but not
# when the make target is to rebuild the makefile # when the make target is to rebuild the makefile
@ -362,14 +356,22 @@ CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX))
endif endif
# Default binutils prefix for cross compile when the # Default binutils prefix for cross compile when the
# crossbindir is not set # crossbindir is not set (except for Darwin)
ifeq ($(OS_TARGET),darwin)
ifeq ($(OS_SOURCE),darwin)
DARWIN2DARWIN=1
endif
endif
ifndef BINUTILSPREFIX ifndef BINUTILSPREFIX
ifndef CROSSBINDIR ifndef CROSSBINDIR
ifdef CROSSCOMPILE ifdef CROSSCOMPILE
ifndef DARWIN2DARWIN
BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)- BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)-
endif endif
endif endif
endif endif
endif
# Try first the full target name, otherwise try only # Try first the full target name, otherwise try only
# the OS for backwards compatibility # the OS for backwards compatibility