Cleanup with respect to headers rules.

* Move specialcasing of gcc2 from HeadersRules into the respective rule
  in SystemLibraryRules.
This commit is contained in:
Oliver Tappe
2014-08-13 13:32:47 +02:00
parent b2883f6a0d
commit 4ca98ce9a9
2 changed files with 11 additions and 10 deletions
+6 -2
View File
@@ -308,7 +308,9 @@ rule C++HeaderDirectories architecture
# Returns the c++ header directories to use for the given architecture.
local c++HeaderDirs ;
if $(architecture) != x86_gcc2 {
if $(architecture) = x86_gcc2 {
c++HeaderDirs = [ FDirName $(HAIKU_TOP) headers cpp ] ;
} else {
local baseDir = [
BuildFeatureAttribute gcc_syslibs_devel : c++-headers : path
] ;
@@ -332,7 +334,9 @@ rule GccHeaderDirectories architecture
# Returns the gcc header directories to use for the given architecture.
local gccHeaderDirs ;
if $(architecture) != x86_gcc2 {
if $(architecture) = x86_gcc2 {
gccHeaderDirs = [ FDirName $(HAIKU_TOP) headers build gcc-2.95.3 ] ;
} else {
local baseDir = [
BuildFeatureAttribute gcc_syslibs_devel : gcc-headers : path
] ;