[haiku-commits] haiku: hrev46682 - build/jam
- From: korli@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 15 Jan 2014 22:49:54 +0100 (CET)
hrev46682 adds 1 changeset to branch 'master'
old head: 00b65b2d7b2c1f47edd0b81b84be637fda107e2d
new head: 66a7f29f59a4b9a9d014f77aeeb64f27a479200a
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=66a7f29+%5E00b65b2
----------------------------------------------------------------------------
66a7f29: x86_64: include the "32" dir when targeting 32-bit
* helps with building boot loader with GCC 4.8
[ Jérôme Duval <jerome.duval@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev46682
Commit: 66a7f29f59a4b9a9d014f77aeeb64f27a479200a
URL: http://cgit.haiku-os.org/haiku/commit/?id=66a7f29
Author: Jérôme Duval <jerome.duval@xxxxxxxxx>
Date: Wed Jan 15 21:41:27 2014 UTC
----------------------------------------------------------------------------
2 files changed, 16 insertions(+), 1 deletion(-)
build/jam/BootRules | 5 +++++
configure | 12 +++++++++++-
----------------------------------------------------------------------------
diff --git a/build/jam/BootRules b/build/jam/BootRules
index de5f677..82dda79 100644
--- a/build/jam/BootRules
+++ b/build/jam/BootRules
@@ -15,6 +15,11 @@ rule SetupBoot
SourceSysHdrs $(sources) : $(TARGET_PRIVATE_KERNEL_HEADERS) ;
}
+ if $(HAIKU_BOOT_C++_HEADERS_DIR_$(TARGET_PACKAGING_ARCH)) {
+ SourceSysHdrs $(sources) :
+ $(HAIKU_BOOT_C++_HEADERS_DIR_$(TARGET_PACKAGING_ARCH)) ;
+ }
+
local object ;
for object in $(objects) {
# add boot flags for the object
diff --git a/configure b/configure
index c7f9a1a..3812c78 100755
--- a/configure
+++ b/configure
@@ -315,11 +315,19 @@ standard_gcc_settings()
local bootLibgcc
local bootLibSupCxx
+ local bootCxxHeaders
case $gccMachine in
x86_64-*)
- # Boot loader is 32-bit, need the 32-bit libs.
+ # Boot loader is 32-bit, need the 32-bit libs and c++
config
bootLibgcc=`$gcc -m32 -print-libgcc-file-name`
bootLibSupCxx=`$gcc -m32 -print-file-name=libsupc++.a`
+
+ local headersBase=$gccdir/../../../..
+ local
headers=$headersBase/$gccMachine/include/c++/$gccRawVersion
+ if [ ! -d $headers ]; then
+ headers=$headersBase/include/c++/$gccRawVersion
+ fi
+ bootCxxHeaders="$headers/$gccMachine/32"
;;
*)
bootLibgcc=$libgcc
@@ -360,6 +368,7 @@ standard_gcc_settings()
set_variable HAIKU_KERNEL_LIBGCC_$targetArch $kernelLibgcc
set_variable HAIKU_CXX_HEADERS_DIR_$targetArch "$cxxHeaders"
set_variable HAIKU_BOOT_LIBGCC_$targetArch $bootLibgcc
+ set_variable HAIKU_BOOT_CXX_HEADERS_DIR_$targetArch "$bootCxxHeaders"
set_variable HAIKU_USE_GCC_GRAPHITE_$targetArch $useGraphite
standard_gcc_settings_targetArch=$targetArch
@@ -922,6 +931,7 @@ for targetArch in $HAIKU_PACKAGING_ARCHS; do
variables="
HAIKU_GCC_HEADERS_DIR HAIKU_GCC_HEADERS_DIR
HAIKU_C++_HEADERS_DIR HAIKU_CXX_HEADERS_DIR
+ HAIKU_BOOT_C++_HEADERS_DIR HAIKU_BOOT_CXX_HEADERS_DIR
HAIKU_GCC_LIBGCC_OBJECTS HAIKU_GCC_LIBGCC_OBJECTS
"
set -- $variables
Other related posts:
- » [haiku-commits] haiku: hrev46682 - build/jam - korli
