From 4591ebc99ad545bab672417533b706d7104a9fac Mon Sep 17 00:00:00 2001
From: Alex Smith <alex@alex-smith.me.uk>
Date: Sat, 18 Aug 2012 19:48:55 +0100
Subject: [PATCH] Fixes for building Haiku x86_64 from itself.

---
 build/jam/OptionalPackages |  2 +-
 configure                  | 19 +++++++++++--------
 src/bin/keymap/Keymap.cpp  |  2 +-
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 50857e6ddc..6784b53a61 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -778,7 +778,7 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ] {
 			: $(baseURL)/m4-1.4.16-x86_64-2012-08-12.zip ;
 		InstallOptionalHaikuImagePackage
 			flex-2.5.35-x86_64-2012-08-18.zip
-			: $(baseURL)/flex-2.5.35-x86_64-2012-08-12.zip ;
+			: $(baseURL)/flex-2.5.35-x86_64-2012-08-18.zip ;
 		InstallOptionalHaikuImagePackage
 			jam-2.5-x86_64-2012-08-12.zip
 			: $(baseURL)/jam-2.5-x86_64-2012-08-12.zip ;
diff --git a/configure b/configure
index f43bac6864..b7e0d33eb8 100755
--- a/configure
+++ b/configure
@@ -257,14 +257,17 @@ standard_gcc_settings()
 		;;
 	esac
 
-	if [ "$targetArch" = "x86_64" ]; then
-		# Boot loader is 32-bit, need the 32-bit libs.
-		HAIKU_BOOT_LIBGCC=`$HAIKU_CC -m32 -print-libgcc-file-name`
-		HAIKU_BOOT_LIBSUPCXX=`$HAIKU_CC -m32 -print-file-name=libsupc++.a`
-	else
-		HAIKU_BOOT_LIBGCC=$HAIKU_GCC_LIBGCC
-		HAIKU_BOOT_LIBSUPCXX=$HAIKU_STATIC_LIBSUPCXX
-	fi
+	case $HAIKU_GCC_MACHINE in
+		x86_64-*)
+			# Boot loader is 32-bit, need the 32-bit libs.
+			HAIKU_BOOT_LIBGCC=`$HAIKU_CC -m32 -print-libgcc-file-name`
+			HAIKU_BOOT_LIBSUPCXX=`$HAIKU_CC -m32 -print-file-name=libsupc++.a`
+		;;
+		*)
+			HAIKU_BOOT_LIBGCC=$HAIKU_GCC_LIBGCC
+			HAIKU_BOOT_LIBSUPCXX=$HAIKU_STATIC_LIBSUPCXX
+		;;
+	esac
 }
 
 # set_default_value
diff --git a/src/bin/keymap/Keymap.cpp b/src/bin/keymap/Keymap.cpp
index 29cc48ce5d..0bf6cf81d5 100644
--- a/src/bin/keymap/Keymap.cpp
+++ b/src/bin/keymap/Keymap.cpp
@@ -569,7 +569,7 @@ Keymap::SaveAsSource(const char* name)
 	_SaveSourceText(file, &textRuns);
 
 	if (textRuns != NULL) {
-		ssize_t dataSize;
+		int32 dataSize;
 		void* data = BTextView::FlattenRunArray(textRuns, &dataSize);
 		if (data != NULL) {
 			BNode node(name);