From: Lionel Sambuc <lionel@minix3.org>
Date: Tue, 27 Nov 2012 11:40:17 +0000 (+0000)
Subject: Adding missing symlink to dynamic loader.
X-Git-Tag: v3.2.1~181
X-Git-Url: http://zhaoyanbai.com/repos/Bv9ARM.ch03.html?a=commitdiff_plain;h=9f7fb970003fc15b265fb37e979a0fe270ba01cd;p=minix.git

Adding missing symlink to dynamic loader.

As the release script does not copy over files from the currently
running system anymore, it has appeared that some binaries are
looking for the dynamic loader in /lib instead of /usr/lib.

It has been replaced by a symlink to ensure compatibility with
binaries, until the path is updated in all the toolchains to be
the same.
---

diff --git a/distrib/sets/lists/minix/mi b/distrib/sets/lists/minix/mi
index fbd2e298a..855e84f12 100644
--- a/distrib/sets/lists/minix/mi
+++ b/distrib/sets/lists/minix/mi
@@ -105,6 +105,7 @@
 ./etc/utmp				minix-sys
 ./home					minix-sys
 ./libexec/ld-elf.so.1			minix-sys
+./libexec/ld.elf_so			minix-sys
 ./libexec				minix-sys
 ./lib					minix-sys
 ./lib/cpp 				minix-sys
diff --git a/libexec/ld.elf_so/Makefile b/libexec/ld.elf_so/Makefile
index 378c37dcc..3378bbe13 100644
--- a/libexec/ld.elf_so/Makefile
+++ b/libexec/ld.elf_so/Makefile
@@ -13,6 +13,8 @@ LDSTATIC=	-dynamic
 
 # And the minix gcc currently references /libexec/ld-elf.so.1
 SYMLINKS+=	${SHLINKINSTALLDIR}/${PROG} /libexec/ld-elf.so.1
+# Minix Clang binaries references /libexec/ld.elf_so
+SYMLINKS+=	${SHLINKINSTALLDIR}/${PROG} /libexec/ld.elf_so
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)