Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Added variables KERNEL_C++_SUPPORT_LIBS and STL_HEADERS to aid support

Browse Source 
for building under Linux.
* Tried to get the header setup into a shape that would allow us to build
  under Linux with gcc 3.x. But I give up for the moment. The C++ support
  headers don't seem to be separate from the STL headers, which makes it
  virtually impossible to use our STL together with gcc 3.x.
  Worse, I don't even think, how we build under BeOS at the moment is
  correct. The _G_config.h (glibc configuration) header is included from
  some public headers, but is itself not made available. This causes the
  R5 header to be used, which belongs to a completely different glibc
  version. But when building our libroot we use the new header. I wouldn't
  be surprised, if that could cause all kinds of subtle problems. Maybe
  even the STL string problem I encountered recently.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@11607 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2005-03-06 17:03:29 +00:00
parent a8e00c29fe
commit 99801d4a88
1 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Jamrules
View File

@ -253,8 +253,14 @@ if $(OS) = BEOS {
if $(GCC_VERSION[1]) >= 3 {
C++_SUPPORT_LIBS = supc++ ;
KERNEL_C++_SUPPORT_LIBS = -L/usr/lib -l$(C++_SUPPORT_LIBS) -lgcc_eh ;
# TODO: -L/usr/lib is a bit Linux specific.
STL_HEADERS = /usr/include/g++ ;
# TODO: Also a bit Linux specific.
} else {
C++_SUPPORT_LIBS = ;
KERNEL_C++_SUPPORT_LIBS = ;
STL_HEADERS = [ FDirName $(OBOS_TOP) headers cpp ] ;
}
@ -308,18 +314,36 @@ OBOS_FLOPPY = floppy.$(OBOS_ARCH) ;
rule SetupIncludes
{
# XXX add "opengl" later
local os_includes = add-ons add-ons/file_system add-ons/graphics add-ons/input_server add-ons/screen_saver add-ons/tracker app device drivers game interface kernel media mail midi midi2 net storage support translation ;
local os_includes = add-ons add-ons/file_system add-ons/graphics
add-ons/input_server add-ons/screen_saver
add-ons/tracker app device drivers game interface
kernel media mail midi midi2 net storage support
translation ;
# Overwrite any exiting content when changing HDRS. This rule may be invoked multiple times.
# Use headers directory, to allow to do things like include <posix/string.h>
HDRS = [ FDirName $(OBOS_TOP) headers ] ;
HDRS = [ FDirName $(OBOS_TOP) headers cpp ] ;
# Use posix headers directory
HDRS += [ FDirName $(OBOS_TOP) headers posix ] ;
# TODO: This is actually more correct. Under BeOS
# /boot/develop/headers/posix/_G_config.h is included, which is not correct,
# since we use another glibc version. This might even be a reason why STL
# string has problems (see strace sources). The problem is just that there
# are conflicts with STL/gcc headers, if we do that.
# # This is nasty, but we don't get around it, since some public headers
# # include _G_config.h which in turn includes other private headers.
# HDRS += [ FDirName $(OBOS_TOP) src kernel libroot posix glibc include ] ;
# HDRS += [ FDirName $(OBOS_TOP) src kernel libroot posix glibc include arch
# $(OBOS_ARCH) ] ;
# HDRS += [ FDirName $(OBOS_TOP) src kernel libroot posix glibc ] ;
# HDRS += [ FDirName $(OBOS_TOP) src kernel libroot posix glibc libio ] ;
# # for _G_config.h
HDRS += $(STL_HEADERS) ;
# Use public OS header directories
HDRS += [ PublicHeaders $(os_includes) ] ;