diff options
| author | Rich Felker <dalias@aerifal.cx> | 2012-02-17 23:17:48 -0500 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2012-02-17 23:17:48 -0500 |
| commit | 3c870263c5a14b77628f83c06852a6f340b2443f (patch) | |
| tree | bac113d71e59bf2761f84344bcdeff3d7b3371b6 | |
| parent | 1611ab0d9b10ad3413f452c2b31a6c1c56dd6939 (diff) | |
| download | musl-3c870263c5a14b77628f83c06852a6f340b2443f.tar.gz musl-3c870263c5a14b77628f83c06852a6f340b2443f.tar.xz musl-3c870263c5a14b77628f83c06852a6f340b2443f.zip | |
two fixes for "make install" handling of shared libs
1. don't try to install (and thus build) shared libs when they were disabled in config.mak 2. ensure that the path for the dynamic linker exists before attempting to install it.
| -rw-r--r-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile index f0278075..15ab4fc4 100644 --- a/Makefile +++ b/Makefile @@ -45,7 +45,7 @@ LDSO_PATHNAME = $(syslibdir)/ld-musl-$(ARCH).so.1 all: $(ALL_LIBS) $(ALL_TOOLS) -install: $(ALL_LIBS:lib/%=$(DESTDIR)$(libdir)/%) $(ALL_INCLUDES:include/%=$(DESTDIR)$(includedir)/%) $(ALL_TOOLS:tools/%=$(DESTDIR)$(bindir)/%) $(DESTDIR)$(LDSO_PATHNAME) +install: $(ALL_LIBS:lib/%=$(DESTDIR)$(libdir)/%) $(ALL_INCLUDES:include/%=$(DESTDIR)$(includedir)/%) $(ALL_TOOLS:tools/%=$(DESTDIR)$(bindir)/%) $(if $(SHARED_LIBS),$(DESTDIR)$(LDSO_PATHNAME),) clean: rm -f crt/*.o @@ -110,6 +110,7 @@ $(DESTDIR)$(includedir)/%: include/% install -D -m 644 $< $@ $(DESTDIR)$(LDSO_PATHNAME): lib/libc.so + install -d -m 755 $(DESTDIR)$(syslibdir) ln -sf $(libdir)/libc.so $@ || true .PRECIOUS: $(CRT_LIBS:lib/%=crt/%) |