i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move include directories for C++ headers to the beginning. This makes

Browse Source 
include_next work properly with newer headers. GCC 4.3.2 has a <cstddef> in its
C++ headers for example that does an include_next of <stddef.h>. The latter is
located in the C headers. For this to work, the include directory for the C
headers needs to be specified later than the one of the C++ headers.
With that Haiku is now completely buildable with GCC 4.3.2.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28995 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz
2009-01-23 03:23:21 +00:00
parent bc840cd466
commit 09a009d4af
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/HeadersRules
+11 -9
View File
@@ -370,8 +370,18 @@ rule FStandardHeaders
kernel media mail midi midi2 net opengl storage support kernel media mail midi midi2 net opengl storage support
translation ; translation ;
local headers = ;
# The C++ headers. If specified, we use the compiler headers, otherwise
# the ones that come with our libstdc++.
if $(HAIKU_C++_HEADERS_DIR) {
headers += $(HAIKU_C++_HEADERS_DIR) ;
} else {
headers += [ FDirName $(HAIKU_TOP) headers cpp ] ;
}
# GCC headers # GCC headers
local headers = $(HAIKU_GCC_HEADERS_DIR) ; headers += $(HAIKU_GCC_HEADERS_DIR) ;
# Use headers directory, to allow to do things like include <posix/string.h> # Use headers directory, to allow to do things like include <posix/string.h>
headers += [ FDirName $(HAIKU_TOP) headers ] ; headers += [ FDirName $(HAIKU_TOP) headers ] ;
@@ -392,14 +402,6 @@ rule FStandardHeaders
# Use the root of the private headers -- not so nice, but simplifies things. # Use the root of the private headers -- not so nice, but simplifies things.
headers += [ PrivateHeaders $(DOT) ] ; headers += [ PrivateHeaders $(DOT) ] ;
# The C++ headers. If specified, we use the compiler headers, otherwise
# the ones that come with our libstdc++.
if $(HAIKU_C++_HEADERS_DIR) {
headers += $(HAIKU_C++_HEADERS_DIR) ;
} else {
headers += [ FDirName $(HAIKU_TOP) headers cpp ] ;
}
return $(headers) ; return $(headers) ;
} }