From 2607f1f32c019546dabf2f7a0e341306dcc39bea Mon Sep 17 00:00:00 2001
From: daniel <daniel@freepascal.org>
Date: Mon, 19 Mar 2007 15:33:06 +0000
Subject: [PATCH]   * Better check to avoid cross-binutils

git-svn-id: trunk@6934 -
---
 compiler/utils/samplecfg | 35 +++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)

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