Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup with respect to headers rules.

Browse Source 
* Move specialcasing of gcc2 from HeadersRules into the respective rule
  in SystemLibraryRules.
This commit is contained in:
Oliver Tappe 2014-08-05 10:11:22 +02:00
parent b2883f6a0d
commit 4ca98ce9a9
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
build/jam/HeadersRules
View File

@ -456,14 +456,11 @@ rule FStandardHeaders architecture
local headers = ;
# The C++ headers and gcc headers.
if $(architecture) != x86_gcc2 {
headers += [ C++HeaderDirectories $(architecture) ] ;
headers += [ GccHeaderDirectories $(architecture) ] ;
} else {
headers += [ FDirName $(HAIKU_TOP) headers cpp ] ;
headers += [ FDirName $(HAIKU_TOP) headers build gcc-2.95.3 ] ;
}
# The c++ headers.
headers += [ C++HeaderDirectories $(architecture) ] ;
# The gcc headers.
headers += [ GccHeaderDirectories $(architecture) ] ;
# Use headers directory, to allow to do things like include <posix/string.h>
headers += [ FDirName $(HAIKU_TOP) headers ] ;

8
build/jam/SystemLibraryRules
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
] ;