summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPalmer Dabbelt <palmer@dabbelt.com>2017-12-26 20:55:34 -0800
committerPalmer Dabbelt <palmer@dabbelt.com>2018-01-06 23:35:46 -0800
commit005055325176500f03fbd64f122bc4de64719c46 (patch)
tree42583e19c9ce5a573f29d0e73d860dacc5732210
parent31a98837be41b03853fcc607e3a7be6b0525a910 (diff)
downloadglibc-005055325176500f03fbd64f122bc4de64719c46.tar.gz
Allow make-link-multidir to make subdirectories
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.
-rw-r--r--ChangeLog2
-rw-r--r--Makerules1
2 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 0e2c7420e0..6dc8a41fd6 100644
--- 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>
diff --git a/Makerules b/Makerules
index d94e4ca0c1..ef6abeac6d 100644
--- 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