Swap around the sense of library and symlink on musl This opens the door to replacing the libc symlink with a linker script --- a/Makefile 2020-10-09 12:22:04.117697122 +0000 +++ b/Makefile 2020-10-09 12:28:45.910652066 +0000 @@ -74,6 +74,7 @@ WRAPCC_CLANG = clang LDSO_PATHNAME = $(syslibdir)/ld-musl-$(ARCH)$(SUBARCH).so.1 +LDSO_NAME = ld-musl-$(ARCH)$(SUBARCH).so.1 -include config.mak -include $(srcdir)/arch/$(ARCH)/arch.mak @@ -192,7 +193,9 @@ $(INSTALL) -D $< $@ $(DESTDIR)$(libdir)/%.so: lib/%.so - $(INSTALL) -D -m 755 $< $@ + $(INSTALL) -D -l $(LDSO_PATHNAME) $(DESTDIR)$(libdir)/libc.so + $(INSTALL) -D -l $(LDSO_NAME) $(DESTDIR)$(syslibdir)/libc.so.1 + $(INSTALL) -D -m 755 lib/libc.so $(DESTDIR)$(LDSO_PATHNAME) $(DESTDIR)$(libdir)/%: lib/% $(INSTALL) -D -m 644 $< $@ @@ -209,10 +212,10 @@ $(DESTDIR)$(includedir)/%: $(srcdir)/include/% $(INSTALL) -D -m 644 $< $@ -$(DESTDIR)$(LDSO_PATHNAME): $(DESTDIR)$(libdir)/libc.so - $(INSTALL) -D -l $(libdir)/libc.so $@ || true +#$(DESTDIR)$(LDSO_PATHNAME): $(DESTDIR)$(libdir)/libc.so +# $(INSTALL) -D -m 755 lib/libc.so $(DESTDIR)$(libdir)/libc.so -install-libs: $(ALL_LIBS:lib/%=$(DESTDIR)$(libdir)/%) $(if $(SHARED_LIBS),$(DESTDIR)$(LDSO_PATHNAME),) +install-libs: $(ALL_LIBS:lib/%=$(DESTDIR)$(libdir)/%) #$(if $(SHARED_LIBS),$(DESTDIR)$(LDSO_PATHNAME),) install-headers: $(ALL_INCLUDES:include/%=$(DESTDIR)$(includedir)/%)