Skip to content

Commit 350fa1b

Browse files
committed
---
yaml --- r: 153342 b: refs/heads/try2 c: 5ee270a h: refs/heads/master v: v3
1 parent 252513f commit 350fa1b

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: ad82cb5621820526cf2d32651c063f6b7a2ea255
8+
refs/heads/try2: 5ee270a148f95c35b14872fc6497e66c11177ea3
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/etc/install.sh

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,9 +293,11 @@ elif [ "$CFG_OSTYPE" = "Darwin" ]
293293
then
294294
CFG_LD_PATH_VAR=DYLD_LIBRARY_PATH
295295
CFG_OLD_LD_PATH_VAR=$DYLD_LIBRARY_PATH
296+
UNIX=1
296297
else
297298
CFG_LD_PATH_VAR=LD_LIBRARY_PATH
298299
CFG_OLD_LD_PATH_VAR=$LD_LIBRARY_PATH
300+
UNIX=1
299301
fi
300302

301303
flag uninstall "only uninstall from the installation prefix"
@@ -466,6 +468,17 @@ while read p; do
466468
# The manifest lists all files to install
467469
done < "${CFG_SRC_DIR}/${CFG_LIBDIR_RELATIVE}/rustlib/manifest.in"
468470

471+
# Run ldconfig to make dynamic libraries available to the linker
472+
if [ $UNIX -eq 1 ]
473+
then
474+
ldconfig
475+
if [ $? -ne 0 ]
476+
then
477+
warn "failed to run ldconfig."
478+
warn "this may happen when not installing as root, in which case you know what you are doing and it's probably fine."
479+
fi
480+
fi
481+
469482
# Sanity check: can we run the installed binaries?
470483
#
471484
# As with the verification above, make sure the right LD_LIBRARY_PATH-equivalent
@@ -494,7 +507,6 @@ then
494507
fi
495508
fi
496509

497-
498510
echo
499511
echo " Rust is ready to roll."
500512
echo

0 commit comments

Comments
 (0)