Changeset 2550 in kBuild

Timestamp:

Nov 9, 2011 12:51:50 PM (13 years ago)

Author:

bird

Message:

header.kmk: Property list fixes.

File:

• trunk/kBuild/header.kmk (modified) (4 diffs)

trunk/kBuild/header.kmk

@@ -962 +962 @@
 ## PROPS_SINGLE_LNK
 # Subset of PROPS_SINGLE which applies to all linkable targets.
-PROPS_SINGLE_LNK := TOOL TEMPLATE CTOOL CXXTOOL OBJCTOOL OBJCXXTOOL ASTOOL RCTOOL \
-        INST NOINST BLD_TYPE BLD_TRG BLD_TRG_ARCH BLD_TRG_CPU \
-        OBJSUFF COBJSUFF CXXOBJSUFF OBJCOBJSUFF OBJCXXOBJSUFF ASOBJSUFF RCOBJSUFF \
-        MODE UID GID LD_DEBUG DEBUG_INSTTYPE DEBUG_INST DEBUG_STAGE
+PROPS_SINGLE_LNK := $(filter-out FETCHTOOL UNPACKTOOL PATCHTOOL FETCHDIR, $(PROPS_SINGLE))
 
 ## PROPS_DEFERRED
@@ -993 +990 @@
 ## PROPS_ACCUMULATE_R_LNK
 # Subset of PROPS_ACCUMULATE_R which applies to all linkable targets.
-PROPS_ACCUMULATE_R_LNK := \
-        DEPS LNK_DEPS ORDERDEPS LNK_ORDERDEPS DEFS \
-        CFLAGS CDEFS \
-        CXXFLAGS CXXDEFS \
-        OBJCFLAGS OBJCDEFS \
-        OBJCXXFLAGS OBJCXXDEFS \
-        ASFLAGS ASDEFS \
-        RCFLAGS RCDEFS \
-        IDFLAGS IFFLAGS ISFLAGS
+PROPS_ACCUMULATE_R_LNK := $(filter-out ARFLAGS LDFLAGS EXEC_IFFLAGS FETCHFLAGS UNPACKFLAGS PATCHFLAGS, $(PROPS_ACCUMULATE_R))
 
 ## PROPS_ACCUMULATE
@@ -1015 +1004 @@
 ## PROPS_ACCUMULATE_L_LNK
 # Subset of PROPS_ACCUMULATE_L which applies to all linkable targets.
-PROPS_ACCUMULATE_L_LNK := \
-        SDKS USES SOURCES SRC_HANDLERS INTERMEDIATES \
-        INCS CINCS CXXINCS OBJCINCS OBJCXXINCS ASINCS RCINCS \
-        BLDDIRS CLEAN
+PROPS_ACCUMULATE_L_LNK := $(filter-out LIBS LIBPATH EXEC_SOURCES DIRS, $(PROPS_ACCUMULATE_L))
 
 ## PROPS_ALL
@@ -1066 +1052 @@
 ## @name Properties valid on installs (INSTALLS)
 ## @{
-PROPS_INSTALLS_SINGLE        := TOOL TEMPLATE INST NOINST BLD_TYPE BLD_TRG BLD_TRG_ARCH BLD_TRG_CPU MODE UID GID
+PROPS_INSTALLS_SINGLE        := TOOL TEMPLATE INSTTYPE INST STAGE NOINST BLD_TYPE BLD_TRG BLD_TRG_ARCH BLD_TRG_CPU MODE UID GID
 PROPS_INSTALLS_DEFERRED      := INSTFUN INSTALLER PRE_FILE_CMDS POST_FILE_CMDS PRE_SYMLINK_CMDS POST_SYMLINK_CMDS \
         PRE_DIRECTORY_CMDS POST_DIRECTORY_CMDS