* Better check to avoid cross-binutils

git-svn-id: trunk@6934 -
This commit is contained in:
daniel 2007-03-19 15:33:06 +00:00
parent 9bf4565f0b
commit 2607f1f32c

View File

@ -122,16 +122,28 @@ case $HOSTOS in
esac esac
CPUCROSSIFDEF1="#DEFINE NEEDCROSSBINUTILS"
CPUCROSSIFDEF2=""
case `arch` in case `arch` in
i386) i386|x86_64)
# Cross-binutils are not needed to compile for x86_64 on an i386 system
CPUCROSSIFDEF='#IFNDEF CPUAMD64'
CPUCROSSENDIF='#ENDIF'
;;
x86_64)
# Cross-binutils are not needed to compile for i386 on an x86_64 system # Cross-binutils are not needed to compile for i386 on an x86_64 system
CPUCROSSIFDEF='#IFNDEF CPUI386' CPUCROSSIFDEF1="
CPUCROSSENDIF='#ENDIF' #IFNDEF CPUI386
#IFNDEF CPUAMD64
#DEFINE NEEDCROSSBINUTILS
#ENDIF
#ENDIF
"
CPUCROSSIFDEF2="
#IFNDEF $HOSTOS
#DEFINE NEEDCROSSBINUTILS
#ENDIF
"
;;
*)
CPUCROSSIFDEF1="#DEFINE NEEDCROSSBINUTILS"
CPUCROSSIFDEF2=""
;; ;;
esac esac
@ -177,11 +189,14 @@ cat <<EOFCFG > $thefile
#ENDIF #ENDIF
# set binutils prefix # set binutils prefix
$CPUCROSSIFDEF $CPUCROSSIFDEF1
$CPUCROSSIFDEF2
#IFDEF FPC_CROSSCOMPILING #IFDEF FPC_CROSSCOMPILING
#IFDEF NEEDCROSSBINUTILS
-XP\$fpctarget- -XP\$fpctarget-
#ENDIF NEEDCROSSBINUTILS
#ENDIF #ENDIF
$CPUCROSSENDIF
# ---------------- # ----------------
# Parsing switches # Parsing switches