]> git.ipfire.org Git - thirdparty/glibc.git/commitdiff
Allow make-link-multidir to make subdirectories
authorPalmer Dabbelt <palmer@dabbelt.com>
Wed, 27 Dec 2017 04:55:34 +0000 (20:55 -0800)
committerPalmer Dabbelt <palmer@dabbelt.com>
Sun, 7 Jan 2018 07:35:46 +0000 (23:35 -0800)
The RISC-V Linux ABI doesn't define any libraries that go directly in
lib, instead they go into lib32/ilp32 or lib64/lp64.  This casuse
make-link-multidir to fail when attempting to make library directories
when building a static libc on multilib RISC-V systems.

This patch uses scripts/mkinstalldirs to make the base directory of the
target symlink of make-link-multidir.

2018-01-06  Palmer Dabbelt  <palmer@sifive.com>

       * Makerules (make-link-multidir): Make directories before linking into
       them.

ChangeLog
Makerules

index 0e2c7420e0e3677a327cd0f9600cd752849c552c..6dc8a41fd669ccbcec2bd2064a9fb23264e81a92 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,8 @@
        (R_RISCV_TLS_DTPREL64): Likewise.
        (R_RISCV_TLS_TPREL32): Likewise.
        (R_RISCV_TLS_TPREL64): Likewise.
+       * Makerules (make-link-multidir): Make directories before linking into
+       them.
 
 2018-01-06  Samuel Thibault  <samuel.thibault@ens-lyon.org>
 
index d94e4ca0c18fab931ca4a7ae3435dadb0f127cac..ef6abeac6d9dd0e9bb1aa68db7f1b64e64f9c9eb 100644 (file)
--- a/Makerules
+++ b/Makerules
@@ -1081,6 +1081,7 @@ mv -f $@.new $@
 endef
 define make-link-multidir
 $(patsubst %/,cd %,$(objpfx)); \
+  $(addprefix $(abspath $(..)scripts/mkinstalldirs) ,$(dir $(multidir))); \
   $(LN_S) . $(multidir) 2> /dev/null; \
   test -L $(multidir)
 endef