[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[xen staging] tools/xs-clients: Fix `make clean` rule



commit 5d8c784783f45ead96cf78fc40f2c10ee91a5396
Author:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Wed Jul 3 23:01:11 2024 +0100
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Thu Jul 4 11:32:55 2024 +0100

    tools/xs-clients: Fix `make clean` rule
    
    Prior to the split, "the clients" used tools/xenstored/Makefile.common whose
    clean rule includes *.o whereas after the split, the removal of *.o was lost
    by virtule of not including Makefile.common any more.
    
    This is the bug behind the following build error:
    
      make[2]: Entering directory '/local/xen.git/tools/xs-clients'
      gcc     xenstore_client.o    (snip)
      /usr/bin/ld: xenstore_client.o: relocation R_X86_64_32S against `.rodata' 
can not be used when making a PIE object; recompile with -fPIE
      /usr/bin/ld: failed to set dynamic section sizes: bad value
      collect2: error: ld returned 1 exit status
      make[2]: *** [Makefile:35: xenstore] Error 1
    
    which was caused by `make clean` not properly cleaning the tree as I was
    swapping between various build containers.
    
    Switch to a plain single-colon clean rule.
    
    Fixes: 5c293058b130 ("tools/xenstore: move xenstored sources into dedicated 
directory")
    Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Reviewed-by: Juergen Gross <jgross@xxxxxxxx>
    Release-Acked-by: Oleksii Kurochko <oleksii.kurochko@xxxxxxxxx>
---
 tools/xs-clients/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/xs-clients/Makefile b/tools/xs-clients/Makefile
index 4e78d365e0..5415c44192 100644
--- a/tools/xs-clients/Makefile
+++ b/tools/xs-clients/Makefile
@@ -38,8 +38,8 @@ xenstore-control: xenstore_control.o
        $(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@ $(APPEND_LDFLAGS)
 
 .PHONY: clean
-clean::
-       $(RM) $(TARGETS) $(DEPS_RM)
+clean:
+       $(RM) *.o $(TARGETS) $(DEPS_RM)
 
 .PHONY: distclean
 distclean: clean
--
generated by git-patchbot for /home/xen/git/xen.git#staging



 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.