[haiku-commits] BRANCH xyzzy-github.x86_64 - build/jam src/bin/keymap
- From: xyzzy-github.x86_64 <community@xxxxxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 18 Aug 2012 21:49:19 +0200 (CEST)
added 1 changeset to branch 'refs/remotes/xyzzy-github/x86_64'
old head: aecb9567e3f3bc996cb9ed60fab038e1de07c7f1
new head: 4591ebc99ad545bab672417533b706d7104a9fac
----------------------------------------------------------------------------
4591ebc: Fixes for building Haiku x86_64 from itself.
[ Alex Smith <alex@xxxxxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
Commit: 4591ebc99ad545bab672417533b706d7104a9fac
Author: Alex Smith <alex@xxxxxxxxxxxxxxxx>
Date: Sat Aug 18 18:48:55 2012 UTC
----------------------------------------------------------------------------
3 files changed, 13 insertions(+), 10 deletions(-)
build/jam/OptionalPackages | 2 +-
configure | 19 +++++++++++--------
src/bin/keymap/Keymap.cpp | 2 +-
----------------------------------------------------------------------------
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 50857e6..6784b53 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 f43bac6..b7e0d33 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 29cc48c..0bf6cf8 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);
Other related posts:
- » [haiku-commits] BRANCH xyzzy-github.x86_64 - build/jam src/bin/keymap - xyzzy-github . x86_64
