projects
/
openwrt
/
staging
/
mkresin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
toolchain: add a symlink for musl softfloat ldso to the path where our gcc expects it
[openwrt/staging/mkresin.git]
/
package
/
libs
/
toolchain
/
Makefile
diff --git
a/package/libs/toolchain/Makefile
b/package/libs/toolchain/Makefile
index 202e9d095d6c4b9d1f1f348603e0df1fdc30f5a4..a29b3221ecadcdaf373d46a1d721fa6d75aa691d 100644
(file)
--- a/
package/libs/toolchain/Makefile
+++ b/
package/libs/toolchain/Makefile
@@
-428,6
+428,9
@@
ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
$(1)/lib/
endef
$(1)/lib/
endef
+ LD_MUSL_NAME = $(notdir $(firstword $(wildcard $(TOOLCHAIN_DIR)/lib/ld-musl-*.so*)))
+ $(warning LD_MUSL_NAME='$(LD_MUSL_NAME)')
+
define Package/musl/install
$(INSTALL_DIR) $(1)/lib
$(CP) \
define Package/musl/install
$(INSTALL_DIR) $(1)/lib
$(CP) \
@@
-436,6
+439,7
@@
ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
$(CP) \
$(TOOLCHAIN_DIR)/lib/libc.so* \
$(1)/lib/
$(CP) \
$(TOOLCHAIN_DIR)/lib/libc.so* \
$(1)/lib/
+ $(if $(findstring -sf.so,$(LD_MUSL_NAME)),ln -s $(LD_MUSL_NAME) $(1)/lib/$(subst -sf.so,.so,$(LD_MUSL_NAME)))
endef
define Package/libc/install
endef
define Package/libc/install