diff options
| author | landley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-03-24 02:42:58 +0000 |
|---|---|---|
| committer | landley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-03-24 02:42:58 +0000 |
| commit | 5e6eedcc4e1a6cb3ec6f4623e659f060968942a5 (patch) | |
| tree | 315754397537615b32029f564db24f4b7c68ca9a | |
| parent | d68b2ab5e8c1b06f546f60c5a457bd46c45b90da (diff) | |
| download | busybox-w32-5e6eedcc4e1a6cb3ec6f4623e659f060968942a5.tar.gz busybox-w32-5e6eedcc4e1a6cb3ec6f4623e659f060968942a5.tar.bz2 busybox-w32-5e6eedcc4e1a6cb3ec6f4623e659f060968942a5.zip | |
When cross-compiling, the install directory for shared libraries has to come
from gcc (target machine), not uname (host machine).
git-svn-id: svn://busybox.net/trunk/busybox@14639 69ca8d6d-28ef-0310-b511-8ec308f3f277
| -rwxr-xr-x | applets/install.sh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/applets/install.sh b/applets/install.sh index 0173e7a44..e154996e3 100755 --- a/applets/install.sh +++ b/applets/install.sh | |||
| @@ -18,11 +18,12 @@ esac | |||
| 18 | 18 | ||
| 19 | if [ "$DO_INSTALL_LIBS" != "n" ]; then | 19 | if [ "$DO_INSTALL_LIBS" != "n" ]; then |
| 20 | # get the target dir for the libs | 20 | # get the target dir for the libs |
| 21 | # This is an incomplete/incorrect list for now | 21 | # assume it starts with lib |
| 22 | case $(uname -m) in | 22 | libdir=$($CC -print-file-name=libc.so | \ |
| 23 | x86_64|ppc64*|sparc64*|ia64*|hppa*64*|s390x*) libdir=/lib64 ;; | 23 | sed -n 's%^.*\(/lib[^\/]*\)/libc.so%\1%p') |
| 24 | *) libdir=/lib ;; | 24 | if test -z "$libdir"; then |
| 25 | esac | 25 | libdir=/lib |
| 26 | fi | ||
| 26 | 27 | ||
| 27 | mkdir -p $prefix/$libdir || exit 1 | 28 | mkdir -p $prefix/$libdir || exit 1 |
| 28 | for i in $DO_INSTALL_LIBS; do | 29 | for i in $DO_INSTALL_LIBS; do |