* Added support for compiling Haiku with GCC 4. The main difference is that
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:
@@ -188,6 +188,50 @@ rule SetPlatformCompatibilityFlagVariables
|
||||
?= $($(varPrefix)_PLATFORM_BEOS_COMPATIBLE) ;
|
||||
}
|
||||
|
||||
rule FAnalyzeGCCVersion
|
||||
{
|
||||
# FAnalyzeGCCVersion <rawVersionVariable> ;
|
||||
#
|
||||
local varName = $(1) ;
|
||||
local rawVersion = $($(varName)) ;
|
||||
|
||||
if ! $(rawVersion) {
|
||||
ECHO "Variable $(varName) not set. Please run ./configure or" ;
|
||||
EXIT "specify it manually." ;
|
||||
}
|
||||
|
||||
local version = ;
|
||||
# split the raw version string at `.' and `-' characters
|
||||
while $(rawVersion) {
|
||||
local split = [ Match "([^.-]*)[.-](.*)" : $(rawVersion) ] ;
|
||||
if $(split) {
|
||||
version += $(split[1]) ;
|
||||
rawVersion = $(split[2]) ;
|
||||
} else {
|
||||
version += $(rawVersion) ;
|
||||
rawVersion = ;
|
||||
}
|
||||
}
|
||||
|
||||
return $(version) ;
|
||||
}
|
||||
|
||||
rule SetIncludePropertiesVariables
|
||||
{
|
||||
# SetIncludePropertiesVariables <varPrefix> ;
|
||||
#
|
||||
local prefix = $(1) ;
|
||||
if $($(prefix)_GCC_VERSION[1]) < 4 {
|
||||
$(prefix)_INCLUDES_SEPARATOR = -I- ;
|
||||
$(prefix)_LOCAL_INCLUDES_OPTION = -I ;
|
||||
$(prefix)_SYSTEM_INCLUDES_OPTION = -I ;
|
||||
} else {
|
||||
$(prefix)_INCLUDES_SEPARATOR = ;
|
||||
$(prefix)_LOCAL_INCLUDES_OPTION = "-iquote " ;
|
||||
$(prefix)_SYSTEM_INCLUDES_OPTION = "-idirafter " ;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
#pragma mark -
|
||||
|
||||
|
||||
Reference in New Issue
Block a user