Changeset 989 in kBuild

Timestamp:

May 29, 2007 4:09:17 AM (18 years ago)

Author:

bird

Message:

forgot sysmods and import libraries inherting.

Location:

trunk/kBuild

Files:

• footer.kmk (modified) (2 diffs)
• header.kmk (modified) (2 diffs)

trunk/kBuild/footer.kmk

@@ -355 +355 @@
 properties_now      := $(call _COMB_KEY_PROP,$(PROPS_LIBRARIES_ACCUMULATE_R) $(PROPS_LIBRARIES_ACCUMULATE_L))
 properties_deferred := $(call _COMB_KEY_PROP,$(PROPS_LIBRARIES_DEFERRED))
-$(foreach trg, $(_ALL_LIBRARIES) $(_ALL_IMPORT_LIBS),$(eval $(value def_inherit)))
+ifeq ($(filter-out nt os2 win win64 win32,$(BUILD_TARGET)),)
+ $(foreach trg, $(_ALL_LIBRARIES) $(_ALL_IMPORT_LIBS),$(eval $(value def_inherit)))
+else
+ $(foreach trg, $(_ALL_LIBRARIES),$(eval $(value def_inherit)))
+endif
 
 # DLLs.
@@ -361 +365 @@
 properties_now      := $(call _COMB_KEY_PROP,$(PROPS_DLLS_ACCUMULATE_R) $(PROPS_DLLS_ACCUMULATE_L))
 properties_deferred := $(call _COMB_KEY_PROP,$(PROPS_DLLS_DEFERRED))
-$(foreach trg, $(_ALL_DLLS),$(eval $(value def_inherit)))
+ifeq ($(filter-out nt os2 win win64 win32,$(BUILD_TARGET)),)
+ $(foreach trg, $(_ALL_DLLS),$(eval $(value def_inherit)))
+else
+ $(foreach trg, $(_ALL_DLLS) $(_ALL_IMPORT_LIBS),$(eval $(value def_inherit)))
+endif
+
+# System modules.
+properties          := $(call _COMB_KEY_PROP,$(PROPS_SYSMODS_SINGLE))
+properties_now      := $(call _COMB_KEY_PROP,$(PROPS_SYSMODS_ACCUMULATE_R) $(PROPS_SYSMODS_ACCUMULATE_L))
+properties_deferred := $(call _COMB_KEY_PROP,$(PROPS_SYSMODS_DEFERRED))
+$(foreach trg, $(_ALL_SYSMODS),$(eval $(value def_inherit)))
 
 # Installs.

trunk/kBuild/header.kmk

@@ -615 +615 @@
 ## @name Properties valid on libraries (LIBRARIES and IMPORT_LIBS)
 ## @{
-PROPS_LIBRARIES_SINGLE       := $(PROPS_SINGLE_LNK) ARTOOL LIBSUFF ARLIBSUFF
+PROPS_LIBRARIES_SINGLE       := $(PROPS_SINGLE_LNK) ARTOOL LIBSUFF ARLIBSUFF LIBSUFF
 PROPS_LIBRARIES_DEFERRED     := $(filter-out SONAME,$(PROPS_DEFERRED))
 PROPS_LIBRARIES_ACCUMULATE_R := $(PROPS_ACCUMULATE_R_LNK) ARFLAGS
@@ -627 +627 @@
 PROPS_DLLS_ACCUMULATE_R      := $(PROPS_ACCUMULATE_R_LNK) LDFLAGS
 PROPS_DLLS_ACCUMULATE_L      := $(PROPS_ACCUMULATE_L_LNK) LIBS LIBPATH
+## @}
+
+## @name Properties valid on system modules (SYSMODS)
+## @{
+PROPS_SYSMODS_SINGLE         := $(PROPS_SINGLE_LNK) LDTOOL SYSSUFF
+PROPS_SYSMODS_DEFERRED       := $(PROPS_DEFERRED)
+PROPS_SYSMODS_ACCUMULATE_R   := $(PROPS_ACCUMULATE_R_LNK) LDFLAGS
+PROPS_SYSMODS_ACCUMULATE_L   := $(PROPS_ACCUMULATE_L_LNK) LIBS LIBPATH
 ## @}