Changeset 3630

Timestamp:

Oct 25, 2024, 11:49:17 AM (3 weeks ago)

Author:

bird

Message:

header.kmk,footer-pass2-compiling-targets.kmk: Added EARLY_LIBS and LATE_LIBS properties to better control the library order when using templates. The libraries are collected from EARLY_LIBS first, then LIBS, and LATE_LIBS last.

Location:

trunk/kBuild

Files:

• footer-pass2-compiling-targets.kmk (modified) (6 diffs)
• header.kmk (modified) (5 diffs)

trunk/kBuild/footer-pass2-compiling-targets.kmk

@@ -897 +897 @@
         $($(target)_LDFLAGS.$(bld_trg).$(bld_trg_arch))\
         $($(target)_LDFLAGS.$(bld_trg_cpu))
+
+local targetsdks  := \
+        $($(target)_SDKS.$(bld_trg).$(bld_trg_arch))\
+        $($(target)_SDKS.$(bld_trg_arch))\
+        $($(target)_SDKS.$(bld_trg))\
+        $($(target)_SDKS.$(bld_type))\
+        $($(target)_SDKS)
+local globalsdks  := \
+        $(SDKS.$(bld_trg).$(bld_trg_arch))\
+        $(SDKS.$(bld_trg_arch))\
+        $(SDKS.$(bld_trg))\
+        $(SDKS.$(bld_type))\
+        $(SDKS)
+# Note! Global EARLY_LIBS and LATE_LIBS variables are ignored.
+## @todo ignore global LIBS and most other global properties.
 local libs        :=\
+        $($(target)_EARLY_LIBS.$(bld_trg_cpu))\
+        $($(target)_EARLY_LIBS.$(bld_trg).$(bld_trg_arch))\
+        $($(target)_EARLY_LIBS.$(bld_trg_arch))\
+        $($(target)_EARLY_LIBS.$(bld_trg))\
+        $($(target)_EARLY_LIBS.$(bld_type))\
+        $($(target)_EARLY_LIBS)\
+        $(foreach sdk, $(targetsdks) $(globalsdks),\
+                $(SDK_$(sdk)_EARLY_LIBS.$(bld_trg_cpu))\
+                $(SDK_$(sdk)_EARLY_LIBS.$(bld_trg).$(bld_trg_arch))\
+                $(SDK_$(sdk)_EARLY_LIBS.$(bld_trg_arch))\
+                $(SDK_$(sdk)_EARLY_LIBS.$(bld_trg))\
+                $(SDK_$(sdk)_EARLY_LIBS.$(bld_type))\
+                $(SDK_$(sdk)_EARLY_LIBS))\
+        $(TOOL_$(tool)_EARLY_LIBS.$(bld_trg_cpu))\
+        $(TOOL_$(tool)_EARLY_LIBS.$(bld_trg).$(bld_trg_arch))\
+        $(TOOL_$(tool)_EARLY_LIBS.$(bld_trg_arch))\
+        $(TOOL_$(tool)_EARLY_LIBS.$(bld_trg))\
+        $(TOOL_$(tool)_EARLY_LIBS.$(bld_type))\
+        $(TOOL_$(tool)_EARLY_LIBS)\
+        \
         $($(target)_LIBS.$(bld_trg_cpu))\
         $($(target)_LIBS.$(bld_trg).$(bld_trg_arch))\
@@ -904 +939 @@
         $($(target)_LIBS.$(bld_type))\
         $($(target)_LIBS)\
-        $(foreach sdk, $($(target)_SDKS.$(bld_trg).$(bld_trg_arch)) \
-                       $($(target)_SDKS.$(bld_trg_arch)) \
-                       $($(target)_SDKS.$(bld_trg)) \
-                       $($(target)_SDKS.$(bld_type)) \
-                       $($(target)_SDKS),\
+        $(foreach sdk, $(targetsdks),\
                 $(SDK_$(sdk)_LIBS.$(bld_trg_cpu))\
                 $(SDK_$(sdk)_LIBS.$(bld_trg).$(bld_trg_arch))\
@@ -921 +952 @@
         $(LIBS.$(bld_type))\
         $(LIBS)\
-        $(foreach sdk, $(SDKS.$(bld_trg).$(bld_trg_arch)) \
-                       $(SDKS.$(bld_trg_arch)) \
-                       $(SDKS.$(bld_trg)) \
-                       $(SDKS.$(bld_type)) \
-                       $(SDKS),\
+        $(foreach sdk, $(globalsdks),\
                 $(SDK_$(sdk)_LIBS.$(bld_trg_cpu))\
                 $(SDK_$(sdk)_LIBS.$(bld_trg).$(bld_trg_arch))\
@@ -937 +964 @@
         $(TOOL_$(tool)_LIBS.$(bld_trg))\
         $(TOOL_$(tool)_LIBS.$(bld_type))\
-        $(TOOL_$(tool)_LIBS)
+        $(TOOL_$(tool)_LIBS)\
+        \
+        $($(target)_LATE_LIBS.$(bld_trg_cpu))\
+        $($(target)_LATE_LIBS.$(bld_trg).$(bld_trg_arch))\
+        $($(target)_LATE_LIBS.$(bld_trg_arch))\
+        $($(target)_LATE_LIBS.$(bld_trg))\
+        $($(target)_LATE_LIBS.$(bld_type))\
+        $($(target)_LATE_LIBS)\
+        $(foreach sdk, $(targetsdks) $(globalsdks),\
+                $(SDK_$(sdk)_LATE_LIBS.$(bld_trg_cpu))\
+                $(SDK_$(sdk)_LATE_LIBS.$(bld_trg).$(bld_trg_arch))\
+                $(SDK_$(sdk)_LATE_LIBS.$(bld_trg_arch))\
+                $(SDK_$(sdk)_LATE_LIBS.$(bld_trg))\
+                $(SDK_$(sdk)_LATE_LIBS.$(bld_type))\
+                $(SDK_$(sdk)_LATE_LIBS))\
+        $(TOOL_$(tool)_LATE_LIBS.$(bld_trg_cpu))\
+        $(TOOL_$(tool)_LATE_LIBS.$(bld_trg).$(bld_trg_arch))\
+        $(TOOL_$(tool)_LATE_LIBS.$(bld_trg_arch))\
+        $(TOOL_$(tool)_LATE_LIBS.$(bld_trg))\
+        $(TOOL_$(tool)_LATE_LIBS.$(bld_type))\
+        $(TOOL_$(tool)_LATE_LIBS)
 local libpath    :=\
         $($(target)_LIBPATH.$(bld_trg_cpu))\
@@ -945 +992 @@
         $($(target)_LIBPATH.$(bld_type))\
         $($(target)_LIBPATH)\
-        $(foreach sdk, $($(target)_SDKS.$(bld_trg).$(bld_trg_arch)) \
-                       $($(target)_SDKS.$(bld_trg_arch)) \
-                       $($(target)_SDKS.$(bld_trg)) \
-                       $($(target)_SDKS.$(bld_type)) \
-                       $($(target)_SDKS),\
+        $(foreach sdk, $(targetsdks),\
                 $(SDK_$(sdk)_LIBPATH.$(bld_trg_cpu))\
                 $(SDK_$(sdk)_LIBPATH.$(bld_trg).$(bld_trg_arch))\
@@ -962 +1005 @@
         $(LIBPATH.$(bld_type))\
         $(LIBPATH)\
-        $(foreach sdk, $(SDKS.$(bld_trg).$(bld_trg_arch)) \
-                       $(SDKS.$(bld_trg_arch)) \
-                       $(SDKS.$(bld_trg)) \
-                       $(SDKS.$(bld_type)) \
-                       $(SDKS),\
+        $(foreach sdk, $(globalsdks),\
                 $(SDK_$(sdk)_LIBPATH.$(bld_trg_cpu))\
                 $(SDK_$(sdk)_LIBPATH.$(bld_trg).$(bld_trg_arch))\

trunk/kBuild/header.kmk

@@ -1184 +1184 @@
         SDKS USES SOURCES EXEC_SOURCES SRC_HANDLERS INTERMEDIATES \
         INCS CINCS CXXINCS PCHINCS OBJCINCS OBJCXXINCS ASINCS RCINCS \
-        LIBS LIBPATH \
+        EARLY_LIBS LIBS LATE_LIBS LIBPATH \
         DIRS BLDDIRS CLEAN
 ## PROPS_ACCUMULATE_L_LNK
 # Subset of PROPS_ACCUMULATE_L which applies to all linkable targets.
-PROPS_ACCUMULATE_L_LNK := $(filter-out LIBS LIBPATH EXEC_SOURCES DIRS, $(PROPS_ACCUMULATE_L))
+PROPS_ACCUMULATE_L_LNK := $(filter-out EARLY_LIBS LIBS LATE_LIBS LIBPATH EXEC_SOURCES DIRS, $(PROPS_ACCUMULATE_L))
 
 ## PROPS_ALL
@@ -1199 +1199 @@
 PROPS_PROGRAMS_DEFERRED      := $(PROPS_DEFERRED)
 PROPS_PROGRAMS_ACCUMULATE_R  := $(PROPS_ACCUMULATE_R_LNK) LDFLAGS
-PROPS_PROGRAMS_ACCUMULATE_L  := $(PROPS_ACCUMULATE_L_LNK) LIBS LIBPATH
+PROPS_PROGRAMS_ACCUMULATE_L  := $(PROPS_ACCUMULATE_L_LNK) EARLY_LIBS LIBS LATE_LIBS LIBPATH
 ## @}
 
@@ -1215 +1215 @@
 PROPS_DLLS_DEFERRED          := $(PROPS_DEFERRED)
 PROPS_DLLS_ACCUMULATE_R      := $(PROPS_ACCUMULATE_R_LNK) LDFLAGS
-PROPS_DLLS_ACCUMULATE_L      := $(PROPS_ACCUMULATE_L_LNK) LIBS LIBPATH
+PROPS_DLLS_ACCUMULATE_L      := $(PROPS_ACCUMULATE_L_LNK) EARLY_LIBS LIBS LATE_LIBS LIBPATH
 ## @}
 
@@ -1223 +1223 @@
 PROPS_SYSMODS_DEFERRED       := $(PROPS_DEFERRED)
 PROPS_SYSMODS_ACCUMULATE_R   := $(PROPS_ACCUMULATE_R_LNK) LDFLAGS
-PROPS_SYSMODS_ACCUMULATE_L   := $(PROPS_ACCUMULATE_L_LNK) LIBS LIBPATH
+PROPS_SYSMODS_ACCUMULATE_L   := $(PROPS_ACCUMULATE_L_LNK) EARLY_LIBS LIBS LATE_LIBS LIBPATH
 ## @}
 
@@ -1231 +1231 @@
 PROPS_MISCBINS_DEFERRED      := $(PROPS_DEFERRED)
 PROPS_MISCBINS_ACCUMULATE_R  := $(PROPS_ACCUMULATE_R_LNK) LDFLAGS
-PROPS_MISCBINS_ACCUMULATE_L  := $(PROPS_ACCUMULATE_L_LNK) LIBS LIBPATH
+PROPS_MISCBINS_ACCUMULATE_L  := $(PROPS_ACCUMULATE_L_LNK) EARLY_LIBS LIBS LATE_LIBS LIBPATH
 ## @}