* Missing config header directories in the CreateAsmStructOffsetsHeader
rule. * Automatic whitespace cleanup. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27825 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
ea2317a80c
commit
296f476ec9
|
@ -230,25 +230,26 @@ rule CreateAsmStructOffsetsHeader header : source
|
||||||
local includesSeparator ;
|
local includesSeparator ;
|
||||||
local localIncludesOption ;
|
local localIncludesOption ;
|
||||||
local systemIncludesOption ;
|
local systemIncludesOption ;
|
||||||
|
|
||||||
on $(header) { # use on $(1) variable values
|
on $(header) { # use on $(1) variable values
|
||||||
if ! $(PLATFORM) in $(SUPPORTED_PLATFORMS) {
|
if ! $(PLATFORM) in $(SUPPORTED_PLATFORMS) {
|
||||||
return ;
|
return ;
|
||||||
}
|
}
|
||||||
|
|
||||||
# headers and defines
|
# headers and defines
|
||||||
headers = $(SEARCH_SOURCE) $(SUBDIRHDRS) $(HDRS) ;
|
headers = $(HAIKU_CONFIG_HEADERS) $(SEARCH_SOURCE) $(SUBDIRHDRS)
|
||||||
|
$(HDRS) ;
|
||||||
sysHeaders = $(SUBDIRSYSHDRS) $(SYSHDRS) ;
|
sysHeaders = $(SUBDIRSYSHDRS) $(SYSHDRS) ;
|
||||||
defines = $(DEFINES) ;
|
defines = $(DEFINES) ;
|
||||||
|
|
||||||
if $(PLATFORM) = host {
|
if $(PLATFORM) = host {
|
||||||
sysHeaders += $(HOST_HDRS) ;
|
sysHeaders += $(HOST_HDRS) ;
|
||||||
defines += $(HOST_DEFINES) ;
|
defines += $(HOST_DEFINES) ;
|
||||||
|
|
||||||
if $(USES_BE_API) {
|
if $(USES_BE_API) {
|
||||||
sysHeaders += $(HOST_BE_API_HEADERS) ;
|
sysHeaders += $(HOST_BE_API_HEADERS) ;
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
sysHeaders += $(TARGET_HDRS) ;
|
sysHeaders += $(TARGET_HDRS) ;
|
||||||
defines += $(TARGET_DEFINES) ;
|
defines += $(TARGET_DEFINES) ;
|
||||||
|
@ -260,23 +261,23 @@ rule CreateAsmStructOffsetsHeader header : source
|
||||||
} else {
|
} else {
|
||||||
flags += -O0 ;
|
flags += -O0 ;
|
||||||
}
|
}
|
||||||
|
|
||||||
if $(PLATFORM) = host {
|
if $(PLATFORM) = host {
|
||||||
# warning flags
|
# warning flags
|
||||||
if $(WARNINGS) != 0 {
|
if $(WARNINGS) != 0 {
|
||||||
flags += $(HOST_WARNING_C++FLAGS) ;
|
flags += $(HOST_WARNING_C++FLAGS) ;
|
||||||
}
|
}
|
||||||
|
|
||||||
# debug and other flags
|
# debug and other flags
|
||||||
flags += $(HOST_C++FLAGS) $(HOST_DEBUG_$(DEBUG)_C++FLAGS)
|
flags += $(HOST_C++FLAGS) $(HOST_DEBUG_$(DEBUG)_C++FLAGS)
|
||||||
$(SUBDIRC++FLAGS) $(C++FLAGS) ;
|
$(SUBDIRC++FLAGS) $(C++FLAGS) ;
|
||||||
|
|
||||||
if $(USES_BE_API) {
|
if $(USES_BE_API) {
|
||||||
flags += $(HOST_BE_API_C++FLAGS) ;
|
flags += $(HOST_BE_API_C++FLAGS) ;
|
||||||
}
|
}
|
||||||
|
|
||||||
C++ on $(header) = $(HOST_C++) ;
|
C++ on $(header) = $(HOST_C++) ;
|
||||||
|
|
||||||
includesSeparator = $(HOST_INCLUDES_SEPARATOR) ;
|
includesSeparator = $(HOST_INCLUDES_SEPARATOR) ;
|
||||||
localIncludesOption = $(HOST_LOCAL_INCLUDES_OPTION) ;
|
localIncludesOption = $(HOST_LOCAL_INCLUDES_OPTION) ;
|
||||||
systemIncludesOption = $(HOST_SYSTEM_INCLUDES_OPTION) ;
|
systemIncludesOption = $(HOST_SYSTEM_INCLUDES_OPTION) ;
|
||||||
|
@ -286,11 +287,11 @@ rule CreateAsmStructOffsetsHeader header : source
|
||||||
if $(WARNINGS) != 0 {
|
if $(WARNINGS) != 0 {
|
||||||
flags += $(TARGET_WARNING_C++FLAGS) ;
|
flags += $(TARGET_WARNING_C++FLAGS) ;
|
||||||
}
|
}
|
||||||
|
|
||||||
# debug and other flags
|
# debug and other flags
|
||||||
flags += $(TARGET_C++FLAGS) $(TARGET_DEBUG_$(DEBUG)_C++FLAGS)
|
flags += $(TARGET_C++FLAGS) $(TARGET_DEBUG_$(DEBUG)_C++FLAGS)
|
||||||
$(SUBDIRC++FLAGS) $(C++FLAGS) ;
|
$(SUBDIRC++FLAGS) $(C++FLAGS) ;
|
||||||
|
|
||||||
C++ on $(header) = $(TARGET_C++) ;
|
C++ on $(header) = $(TARGET_C++) ;
|
||||||
|
|
||||||
includesSeparator = $(TARGET_INCLUDES_SEPARATOR) ;
|
includesSeparator = $(TARGET_INCLUDES_SEPARATOR) ;
|
||||||
|
|
Loading…
Reference in New Issue