Reverted r24406. If it builds, it doesn't always work as well. The
change resulted in "version mismatch between boot loader and kernel". So apparently the size of some type changed unintentionally. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24408 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
+10
-4
@@ -365,11 +365,8 @@ rule FStandardHeaders
|
||||
kernel media mail midi midi2 net opengl storage support
|
||||
translation ;
|
||||
|
||||
# GCC headers
|
||||
local headers = $(HAIKU_GCC_HEADERS_DIR) ;
|
||||
|
||||
# Use headers directory, to allow to do things like include <posix/string.h>
|
||||
headers += [ FDirName $(HAIKU_TOP) headers ] ;
|
||||
local headers = [ FDirName $(HAIKU_TOP) headers ] ;
|
||||
|
||||
# Use posix headers directory
|
||||
headers += [ FDirName $(HAIKU_TOP) headers posix ] ;
|
||||
@@ -395,6 +392,15 @@ rule FStandardHeaders
|
||||
headers += [ FDirName $(HAIKU_TOP) headers cpp ] ;
|
||||
}
|
||||
|
||||
# The compiler dependent headers.
|
||||
# TODO: Actually these directory should be listed before the posix and cpp
|
||||
# directories, since the headers found here are supposed to override some of
|
||||
# the headers in the latter directories. Unfortunately some of our headers
|
||||
# are a bit messy (e.g. stddef.h) and using the compiler headers causes
|
||||
# trouble when using different compilers (gcc 2 vs. gcc 4) and different
|
||||
# host platforms (BeOS vs. Linux).
|
||||
headers += $(HAIKU_GCC_HEADERS_DIR) ;
|
||||
|
||||
return $(headers) ;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user