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/OverriddenJamRules
+65 -12
View File
@@ -150,21 +150,33 @@ rule Object
rule As
{
local flags ;
local includesSeparator ;
local localIncludesOption ;
local systemIncludesOption ;
if [ on $(1) return $(PLATFORM) ] = host {
flags = [ on $(1) return $(HOST_ASFLAGS) $(ASFLAGS) ] ;
CC on $(1) = $(HOST_CC) ;
includesSeparator = $(HOST_INCLUDES_SEPARATOR) ;
localIncludesOption = $(HOST_LOCAL_INCLUDES_OPTION) ;
systemIncludesOption = $(HOST_SYSTEM_INCLUDES_OPTION) ;
} else {
flags = [ on $(1) return $(TARGET_ASFLAGS) $(ASFLAGS) ] ;
CC on $(1) = $(TARGET_CC) ;
includesSeparator = $(TARGET_INCLUDES_SEPARATOR) ;
localIncludesOption = $(TARGET_LOCAL_INCLUDES_OPTION) ;
systemIncludesOption = $(TARGET_SYSTEM_INCLUDES_OPTION) ;
}
Depends $(<) : $(>) ;
ASFLAGS on $(<) += $(flags) $(SUBDIRASFLAGS) ;
ASHDRS on $(<) = [ on $(<) FIncludes $(HDRS) ]
$(HDRS_INCLUDES_SEPARATOR) [ on $(<) FSysIncludes $(SYSHDRS) ] ;
ASHDRS on $(<) = [ on $(<) FIncludes $(HDRS) : $(localIncludesOption) ]
$(includesSeparator)
[ on $(<) FSysIncludes $(SYSHDRS) : $(systemIncludesOption) ] ;
ASDEFS on $(<) = [ on $(<) FDefines $(DEFINES) ] ;
}
@@ -217,6 +229,9 @@ rule Cc
on $(1) {
local flags ;
local includesSeparator ;
local localIncludesOption ;
local systemIncludesOption ;
# optimization flags
if $(DEBUG) = 0 {
@@ -241,6 +256,10 @@ rule Cc
CC on $(1) = $(HOST_CC) ;
includesSeparator = $(HOST_INCLUDES_SEPARATOR) ;
localIncludesOption = $(HOST_LOCAL_INCLUDES_OPTION) ;
systemIncludesOption = $(HOST_SYSTEM_INCLUDES_OPTION) ;
} else {
# warning flags
if $(WARNINGS) != 0 {
@@ -252,11 +271,16 @@ rule Cc
$(SUBDIRCCFLAGS) $(CCFLAGS) ;
CC on $(1) = $(TARGET_CC) ;
includesSeparator = $(TARGET_INCLUDES_SEPARATOR) ;
localIncludesOption = $(TARGET_LOCAL_INCLUDES_OPTION) ;
systemIncludesOption = $(TARGET_SYSTEM_INCLUDES_OPTION) ;
}
CCFLAGS on $(<) = $(flags) ;
CCHDRS on $(<) = [ FIncludes $(HDRS) ] $(HDRS_INCLUDES_SEPARATOR)
[ FSysIncludes $(SYSHDRS) ] ;
CCHDRS on $(<) = [ FIncludes $(HDRS) : $(localIncludesOption) ]
$(includesSeparator)
[ FSysIncludes $(SYSHDRS) : $(systemIncludesOption) ] ;
CCDEFS on $(<) = [ FDefines $(DEFINES) ] ;
}
}
@@ -272,6 +296,9 @@ rule C++
on $(1) {
local flags ;
local includesSeparator ;
local localIncludesOption ;
local systemIncludesOption ;
# optimization flags
if $(DEBUG) = 0 {
@@ -296,6 +323,10 @@ rule C++
C++ on $(1) = $(HOST_C++) ;
includesSeparator = $(HOST_INCLUDES_SEPARATOR) ;
localIncludesOption = $(HOST_LOCAL_INCLUDES_OPTION) ;
systemIncludesOption = $(HOST_SYSTEM_INCLUDES_OPTION) ;
} else {
# warning flags
if $(WARNINGS) != 0 {
@@ -307,11 +338,16 @@ rule C++
$(SUBDIRC++FLAGS) $(C++FLAGS) ;
C++ on $(1) = $(TARGET_C++) ;
includesSeparator = $(TARGET_INCLUDES_SEPARATOR) ;
localIncludesOption = $(TARGET_LOCAL_INCLUDES_OPTION) ;
systemIncludesOption = $(TARGET_SYSTEM_INCLUDES_OPTION) ;
}
C++FLAGS on $(<) = $(flags) ;
CCHDRS on $(<) = [ FIncludes $(HDRS) ] $(HDRS_INCLUDES_SEPARATOR)
[ FSysIncludes $(SYSHDRS) ] ;
CCHDRS on $(<) = [ FIncludes $(HDRS) : $(localIncludesOption) ]
$(includesSeparator)
[ FSysIncludes $(SYSHDRS) : $(systemIncludesOption) ] ;
CCDEFS on $(<) = [ FDefines $(DEFINES) ] ;
}
}
@@ -563,13 +599,30 @@ rule ObjectHdrs
local file ;
for file in $(objects) {
HDRS on $(file) = [ on $(file) return $(HDRS) ] $(headers) ;
on $(file) {
local localHeaders = $(HDRS) $(headers) ;
SYSHDRS on $(file) = $(localHeaders) ;
# reformat ASHDRS and CCHDRS
local fileHeaders = [ on $(file) FIncludes $(HDRS) ]
$(HDRS_INCLUDES_SEPARATOR) [ on $(file) FSysIncludes $(SYSHDRS) ] ;
ASHDRS on $(file) = $(fileHeaders) ;
CCHDRS on $(file) = $(fileHeaders) ;
# reformat ASHDRS and CCHDRS
local fileHeaders ;
if $(PLATFORM) = host {
fileHeaders =
[ FIncludes $(localHeaders) : $(HOST_LOCAL_INCLUDES_OPTION) ]
$(HOST_INCLUDES_SEPARATOR)
[ FSysIncludes $(SYSHDRS)
: $(HOST_SYSTEM_INCLUDES_OPTION) ] ;
} else {
fileHeaders =
[ FIncludes $(localHeaders) : $(TARGET_LOCAL_INCLUDES_OPTION) ]
$(TARGET_INCLUDES_SEPARATOR)
[ FSysIncludes $(SYSHDRS)
: $(TARGET_SYSTEM_INCLUDES_OPTION) ] ;
}
ASHDRS on $(file) = $(fileHeaders) ;
CCHDRS on $(file) = $(fileHeaders) ;
}
}
}