[haiku-commits] BRANCH xyzzy-github.x86_64 - /
- From: xyzzy-github.x86_64 <community@xxxxxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 1 Aug 2012 13:49:12 +0200 (CEST)
added 1 changeset to branch 'refs/remotes/xyzzy-github/x86_64'
old head: 9a5503d01c41c7afc680c30256fba28700fc8b60
new head: b77772725ccf08904ed1ed8e0e28500868093ef4
----------------------------------------------------------------------------
b777727: Changed x86_64 toolchain target to x86_64-unknown-haiku.
[ Alex Smith <alex@xxxxxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
Commit: b77772725ccf08904ed1ed8e0e28500868093ef4
Author: Alex Smith <alex@xxxxxxxxxxxxxxxx>
Date: Wed Aug 1 10:46:44 2012 UTC
----------------------------------------------------------------------------
1 file changed, 8 insertions(+), 4 deletions(-)
configure | 12 ++++++++----
----------------------------------------------------------------------------
diff --git a/configure b/configure
index a80eed5..b11cf98 100755
--- a/configure
+++ b/configure
@@ -401,7 +401,7 @@ while [ $# -gt 0 ] ; do
buildCrossToolsScript="${buildCrossToolsScript}_gcc4"
case "$2" in
x86) HAIKU_GCC_MACHINE=i586-pc-haiku;;
- x86_64) HAIKU_GCC_MACHINE=x86_64-pc-haiku;
targetArch=x86_64;;
+ x86_64) HAIKU_GCC_MACHINE=x86_64-unknown-haiku;
targetArch=x86_64;;
ppc) HAIKU_GCC_MACHINE=powerpc-apple-haiku;
targetArch=ppc;;
m68k) HAIKU_GCC_MACHINE=m68k-unknown-haiku;
targetArch=m68k;;
arm) HAIKU_GCC_MACHINE=arm-unknown-haiku;
targetArch=arm;;
@@ -511,6 +511,13 @@ if [ -n "$crossToolsPrefix" ]; then
get_build_tool_path LD ld
get_build_tool_path OBJCOPY objcopy
get_build_tool_path RANLIB ranlib
+fi
+
+# prepare gcc settings
+standard_gcc_settings
+
+# cross tools for gcc4 builds
+if [ -n "$crossToolsPrefix" ]; then
case $HAIKU_GCC_RAW_VERSION in
4.*)
get_build_tool_path ELFEDIT elfedit
@@ -518,9 +525,6 @@ if [ -n "$crossToolsPrefix" ]; then
esac
fi
-# prepare gcc settings
-standard_gcc_settings
-
# check whether the Haiku compiler really targets Haiku or BeOS
case "$HAIKU_GCC_MACHINE" in
*-*-haiku) ;;
Other related posts:
- » [haiku-commits] BRANCH xyzzy-github.x86_64 - / - xyzzy-github . x86_64
