* better fix for not automatically adding cross binutils prefixes for

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

File diff suppressed because it is too large Load Diff

View File

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