Haiku/haiku
Haiku/haiku
1
0
Fork 0
mirror of https://review.haiku-os.org/haiku synced 2024-11-23 07:18:40 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes for building Haiku x86_64 from itself.

Browse Source
This commit is contained in:
Alex Smith 2012-08-18 19:48:55 +01:00
parent aecb9567e3
commit 4591ebc99a
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/jam/OptionalPackages
View File

@ -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 ;

19
configure vendored
View File

@ -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

2
src/bin/keymap/Keymap.cpp
View File

@ -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);