Renamed SystemMain to BuildPlatformMain and adjusted it to use the build platform headers for compilation.
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@3208 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
1df8b22cb1
commit
5dc4e1ef10
24
Jamrules
24
Jamrules
@ -46,6 +46,9 @@ LOCATE on $(HCACHEFILE) $(JCACHEFILE) = $(OBOS_BUILD_DIR) ;
|
||||
include BuildConfig ;
|
||||
}
|
||||
|
||||
# Save the platform default headers.
|
||||
PLATFORM_DEFAULT_HEADERS = $(HDRS) ;
|
||||
|
||||
# We do not include any local BeOS system headers by default
|
||||
CCFLAGS += -nostdinc ;
|
||||
C++FLAGS += -nostdinc ;
|
||||
@ -202,6 +205,12 @@ rule SetupR5Includes
|
||||
HDRS = ;
|
||||
}
|
||||
|
||||
rule SetupDefaultIncludes
|
||||
{
|
||||
# Resets HDRS to the default headers for the build platform.
|
||||
HDRS = $(PLATFORM_DEFAULT_HEADERS) ;
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
# Things Jam needs in order to work :)
|
||||
#-------------------------------------------------------------------------------
|
||||
@ -1475,14 +1484,23 @@ actions KernelStaticLibraryObjects
|
||||
ar -r "$(1)" "$(2)" ;
|
||||
}
|
||||
|
||||
rule SystemMain
|
||||
rule BuildPlatformMain
|
||||
{
|
||||
# Usage SystemMain <target> : <sources> ;
|
||||
# Usage BuildPlatformMain <target> : <sources> ;
|
||||
SetupObjectsDir ;
|
||||
SetupDefaultIncludes ;
|
||||
|
||||
LINKLIBS on $(1) = ;
|
||||
# Remove `-nostdinc' from CCFLAGS and C++FLAGS.
|
||||
local oldCCFLAGS = $(CCFLAGS) ;
|
||||
local oldC++FLAGS = $(C++FLAGS) ;
|
||||
CCFLAGS = [ Filter $(CCFLAGS) : -nostdinc ] ;
|
||||
C++FLAGS = [ Filter $(C++FLAGS) : -nostdinc ] ;
|
||||
|
||||
Main $(1) : $(2) ;
|
||||
|
||||
# Reset CCFLAGS and C++FLAGS to original values.
|
||||
CCFLAGS = $(oldCCFLAGS) ;
|
||||
C++FLAGS = $(oldC++FLAGS) ;
|
||||
}
|
||||
|
||||
rule KernelConfigSection
|
||||
|
Loading…
Reference in New Issue
Block a user