From f147f42f462085f98434068d9e229ff195013200 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 8 Oct 2021 22:57:42 +0100 Subject: [PATCH] mk/libraries.mk: fix trace-ld and trace-ar expansions Noticed this minor logging deficiency when debugged --disable-shared build: LD AR LD CXX src/libstore/local-store.o After the change build is logged as expected: LD src/libmain/libnixmain.a LD src/libfetchers/libnixfetchers.a AR src/libmain/libnixmain.a CXX src/libstore/local-store.o --- mk/libraries.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mk/libraries.mk b/mk/libraries.mk index 07bd54dab..ffd7b5610 100644 --- a/mk/libraries.mk +++ b/mk/libraries.mk @@ -125,8 +125,8 @@ define build-library $(1)_PATH := $$(_d)/$$($(1)_NAME).a $$($(1)_PATH): $$($(1)_OBJS) | $$(_d)/ - $(trace-ld) $(LD) -Ur -o $$(_d)/$$($(1)_NAME).o $$? - $(trace-ar) $(AR) crs $$@ $$(_d)/$$($(1)_NAME).o + $$(trace-ld) $(LD) -Ur -o $$(_d)/$$($(1)_NAME).o $$? + $$(trace-ar) $(AR) crs $$@ $$(_d)/$$($(1)_NAME).o $(1)_LDFLAGS_USE += $$($(1)_PATH) $$($(1)_LDFLAGS)