diff mbox series

[Concept,04/14] examples: Correct dependencies for ulib

Message ID	20250911214425.3687188-5-sjg@u-boot.org
State	New
Headers	From: Simon Glass <sjg@u-boot.org> To: U-Boot Concept <concept@u-boot.org> Date: Thu, 11 Sep 2025 15:44:08 -0600 Message-ID: <20250911214425.3687188-5-sjg@u-boot.org> In-Reply-To: <20250911214425.3687188-1-sjg@u-boot.org> References: <20250911214425.3687188-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: PL2REGMDP4Y33FXBEDWDHE4NKK4HHMPB CC: Heinrich Schuchardt <xypron.glpk@gmx.de>, Simon Glass <sjg@chromium.org> Precedence: list Subject: [Concept] [PATCH 04/14] examples: Correct dependencies for ulib Archived-At: <https://lists.u-boot.org/archives/list/concept@u-boot.org/message/PL2REGMDP4Y33FXBEDWDHE4NKK4HHMPB/> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit
Series	ulib: Add support for Rust main programs \| [Concept,00/14] ulib: Add support for Rust main programs [Concept,01/14] CI: Update to coreboot 25.03 [Concept,02/14] docker: Provide a rust toolchain [Concept,03/14] CI: Switch to new docker image [Concept,04/14] examples: Correct dependencies for ulib [Concept,05/14] ulib: Return the full version with ulib_get_version() [Concept,06/14] ulib: Add a way to obtain the version [Concept,07/14] ulib: Add a very basic rust library [Concept,09/14] doc: Fix a few nits in the ulib docs [Concept,10/14] doc: ulib: Clarify calling functions in any header [Concept,11/14] doc: ulib: Add Rust examples documentation [Concept,12/14] test: ulib: Add a test for the rust example [Concept,13/14] doc: Provide a motivation for ulib [Concept,14/14] CI: Build the Rust examples

Commit Message

Simon Glass Sept. 11, 2025, 9:44 p.m. UTC

  From: Simon Glass <sjg@chromium.org>

We need to check for the ulib library before building any examples. Add
this and ensure that the examples are rebuilt if the library changes.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

 examples/ulib/rules.mk | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff mbox series

Patch

diff --git a/examples/ulib/rules.mk b/examples/ulib/rules.mk
index aba6c63d8b6..c4b0bdb3668 100644
--- a/examples/ulib/rules.mk
+++ b/examples/ulib/rules.mk
@@ -19,11 +19,11 @@  $(foreach obj,$(sys-objs),$(eval $(OUTDIR)/$(obj): \
 
 # Automatic build rules for all programs
 $(foreach prog,$(progs),$(eval $(OUTDIR)/$(prog): \
-	$$(addprefix $(OUTDIR)/,$$($(prog)_objs)) ; \
-	$$(CC) $$(CFLAGS) -o $$@ $$^ $$(SHARED_LDFLAGS)))
+	$$(addprefix $(OUTDIR)/,$$($(prog)_objs)) $(UBOOT_BUILD)/libu-boot.so ; \
+	$$(CC) $$(CFLAGS) -o $$@ $$(filter-out %.so,$$^) $$(SHARED_LDFLAGS)))
 $(foreach prog,$(progs),$(eval $(OUTDIR)/$(prog)_static: \
-	$$(addprefix $(OUTDIR)/,$$($(prog)_objs)) ; \
-	$$(CC) $$(CFLAGS) -o $$@ $$^ $$(STATIC_LDFLAGS)))
+	$$(addprefix $(OUTDIR)/,$$($(prog)_objs)) $(UBOOT_BUILD)/libu-boot.a ; \
+	$$(CC) $$(CFLAGS) -o $$@ $$(filter-out %.a,$$^) $$(STATIC_LDFLAGS)))
 
 # Create the output directory if it doesn't exist
 $(OUTDIR):
@@ -32,8 +32,3 @@  $(OUTDIR):
 # Default rule: compile with U-Boot headers
 $(OUTDIR)/%.o: $(EXAMPLE_DIR)/%.c | $(OUTDIR)
 	$(CC) $(CFLAGS) $(UBOOT_CFLAGS) -c -o $@ $<
-
-# The U-Boot library must be built before we can link against it
-# Order-only prerequisites ensure libraries exist before linking
-$(all_bins): | $(UBOOT_BUILD)/libu-boot.a $(UBOOT_BUILD)/libu-boot.so \
-	$(OUTDIR)
\ No newline at end of file