diff options
| author | Brian Anderson <banderson@mozilla.com> | 2014-07-11 17:08:58 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2014-07-11 21:13:40 -0700 |
| commit | 96418569641eecbb5d87a790ce4300658d46fd46 (patch) | |
| tree | 38e77cbf467f18852f2864985a2cab57590560a2 | |
| parent | 5ee270a148f95c35b14872fc6497e66c11177ea3 (diff) | |
| download | rust-96418569641eecbb5d87a790ce4300658d46fd46.tar.gz rust-96418569641eecbb5d87a790ce4300658d46fd46.zip | |
Only run ldconfig on Linux
| -rw-r--r-- | src/etc/install.sh | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/etc/install.sh b/src/etc/install.sh index d8cc3d3a3f6..c949743ea75 100644 --- a/src/etc/install.sh +++ b/src/etc/install.sh @@ -293,11 +293,9 @@ elif [ "$CFG_OSTYPE" = "Darwin" ] then CFG_LD_PATH_VAR=DYLD_LIBRARY_PATH CFG_OLD_LD_PATH_VAR=$DYLD_LIBRARY_PATH - UNIX=1 else CFG_LD_PATH_VAR=LD_LIBRARY_PATH CFG_OLD_LD_PATH_VAR=$LD_LIBRARY_PATH - UNIX=1 fi flag uninstall "only uninstall from the installation prefix" @@ -469,13 +467,13 @@ while read p; do done < "${CFG_SRC_DIR}/${CFG_LIBDIR_RELATIVE}/rustlib/manifest.in" # Run ldconfig to make dynamic libraries available to the linker -if [ $UNIX -eq 1 ] +if [ "$CFG_OSTYPE" = "Linux" ] then ldconfig if [ $? -ne 0 ] then - warn "failed to run ldconfig." - warn "this may happen when not installing as root, in which case you know what you are doing and it's probably fine." + warn "failed to run ldconfig." + warn "this may happen when not installing as root and may be fine" fi fi |