From 09a009d4afffb23f85bb52efa57a7e5e68e1c85e Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Fri, 23 Jan 2009 03:23:21 +0000 Subject: [PATCH] Move include directories for C++ headers to the beginning. This makes include_next work properly with newer headers. GCC 4.3.2 has a in its C++ headers for example that does an include_next of . 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 --- build/jam/HeadersRules | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/build/jam/HeadersRules b/build/jam/HeadersRules index 9e2db14bef..34498343f4 100644 --- a/build/jam/HeadersRules +++ b/build/jam/HeadersRules @@ -370,8 +370,18 @@ rule FStandardHeaders kernel media mail midi midi2 net opengl storage support 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 - local headers = $(HAIKU_GCC_HEADERS_DIR) ; + headers += $(HAIKU_GCC_HEADERS_DIR) ; # Use headers directory, to allow to do things like include headers += [ FDirName $(HAIKU_TOP) headers ] ; @@ -392,14 +402,6 @@ rule FStandardHeaders # Use the root of the private headers -- not so nice, but simplifies things. 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) ; }