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

* Added support for compiling Haiku with GCC 4. The main difference is that

Browse Source 
we use the libstdc++ (including it's headers) that comes with the
  compiler.
* Apparently option "-I-" has been deprecated, which is why we now treat the
  include stuff a bit differently.
* Removed avcodec from the Haiku image, since the library wouldn't build with
  gcc 4, and I'm not in the mood to fix that (declaration of an array of an
  incomplete type).


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14876 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2005-11-12 22:58:54 +00:00
parent 01eda82dbf
commit 8b5934c975
7 changed files with 222 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/HeadersRules
+32 -13
View File
@@ -1,16 +1,15 @@
# FIncludes <dirs> ;
#
# Overridden to support a second argument, the option to be used.
#
rule FIncludes { return $(2:E="--bad-include-option ")$(1) ; }
# FSysIncludes <dirs> ;
#
# Counterpart of FIncludes for system include search paths.
#
#if $(OSPLAT) = X86 {
rule FSysIncludes { return -I$(<) ; }
HDRS_INCLUDES_SEPARATOR = -I- ;
# } else {
# rule FSysIncludes { return "-i "$(<) ; }
# HDRS_INCLUDES_SEPARATOR = -i- ;
# }
# mwcc support commented out
rule FSysIncludes { return $(2:E="--bad-include-option ")$(1) ; }
rule SubDirSysHdrs
{
@@ -54,8 +53,22 @@ rule ObjectSysHdrs
SYSHDRS on $(file) = $(sysHeaders) ;
# reformat ASHDRS and CCHDRS
local fileHeaders = [ FIncludes $(HDRS) ]
$(HDRS_INCLUDES_SEPARATOR) [ FIncludes $(sysHeaders) ] ;
local fileHeaders ;
if $(PLATFORM) = host {
fileHeaders =
[ FIncludes $(HDRS) : $(HOST_LOCAL_INCLUDES_OPTION) ]
$(HOST_INCLUDES_SEPARATOR)
[ FSysIncludes $(sysHeaders)
: $(HOST_SYSTEM_INCLUDES_OPTION) ] ;
} else {
fileHeaders =
[ FIncludes $(HDRS) : $(TARGET_LOCAL_INCLUDES_OPTION) ]
$(TARGET_INCLUDES_SEPARATOR)
[ FSysIncludes $(sysHeaders)
: $(TARGET_SYSTEM_INCLUDES_OPTION) ] ;
}
ASHDRS on $(file) = $(fileHeaders) ;
CCHDRS on $(file) = $(fileHeaders) ;
}
@@ -356,15 +369,21 @@ rule FStandardHeaders
# Use glibc headers
headers += [ FDirName $(HAIKU_TOP) headers glibc ] ;
headers += [ FDirName $(HAIKU_TOP) headers cpp ] ;
# Use public OS header directories
headers += [ PublicHeaders $(osIncludes) ] ;
# Use the root of the private headers -- not so nice, but simplifies things.
headers += [ PrivateHeaders $(DOT) ] ;
# The platform (compiler actually) dependent 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 ] ;
}
# The compiler dependent headers.
headers += $(HAIKU_GCC_HEADERS_DIR) ;
return $(headers) ;