diff options
| author | Mateusz Guzik <mjg@FreeBSD.org> | 2019-11-30 17:30:01 +0000 |
|---|---|---|
| committer | Mateusz Guzik <mjg@FreeBSD.org> | 2019-11-30 17:30:01 +0000 |
| commit | 9da3dfff9a07ff861719a001bad4d6ade71e31f6 (patch) | |
| tree | 84280bd5f171f51805cb06434daa2e3b7959c1f0 /libexec/rc | |
| parent | 3ac2ac2e085ac3be61caddc3ec9982443e641c4b (diff) | |
| download | src-9da3dfff9a07ff861719a001bad4d6ade71e31f6.tar.gz src-9da3dfff9a07ff861719a001bad4d6ade71e31f6.zip | |
ldconfig: fetch hw.machine_arch only once
This happens to be of significance with poudriere which runs the script a lot
when installing packages.
Notes
Notes:
svn path=/head/; revision=355232
Diffstat (limited to 'libexec/rc')
| -rwxr-xr-x | libexec/rc/rc.d/ldconfig | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libexec/rc/rc.d/ldconfig b/libexec/rc/rc.d/ldconfig index 9e5e02ab29d5..81f6951ea839 100755 --- a/libexec/rc/rc.d/ldconfig +++ b/libexec/rc/rc.d/ldconfig @@ -40,7 +40,9 @@ ldconfig_start() check_startmsgs && echo 'ELF ldconfig path:' ${_LDC} ${ldconfig} -elf ${_ins} ${_LDC} - case `sysctl -n hw.machine_arch` in + machine_arch=$(sysctl -n hw.machine_arch) + + case ${machine_arch} in amd64|mips64|powerpc64) for i in ${ldconfig_local32_dirs}; do if [ -d "${i}" ]; then @@ -62,7 +64,7 @@ ldconfig_start() ;; esac - case `sysctl -n hw.machine_arch` in + case ${machine_arch} in armv[67]) for i in ${ldconfig_localsoft_dirs}; do if [ -d "${i}" ]; then @@ -85,7 +87,7 @@ ldconfig_start() esac # Legacy aout support for i386 only - case `sysctl -n hw.machine_arch` in + case ${machine_arch} in i386) # Default the a.out ldconfig path. : ${ldconfig_paths_aout=${ldconfig_paths}} |