diff options
| author |   Alexey Neyman <stilor@att.net> | 2017-03-22 18:56:39 (GMT) |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2017-03-22 18:56:39 (GMT) |
| commit | 54f43778b1a2723481f3df304b67ead45fe91862 (patch) | |
| tree | f4c71fb52cb49dcd402fb10c63733c74c97cd994 /scripts | |
| parent | 91169535d7071eca5e459c96d3287e5f2d17114e (diff) | |
| parent | 3d1678a7f65ae541eba7114fe7447c38c7d9259d (diff) | |
Merge pull request #657 from stilor/no-ldsoconf
Make creation of ld.so.conf optional
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/build/internals.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/build/internals.sh b/scripts/build/internals.sh index a1c9b55..db9b1fd 100644 --- a/scripts/build/internals.sh +++ b/scripts/build/internals.sh @@ -10,7 +10,7 @@ create_ldso_conf() done CT_DoExecLog ALL mkdir -p "${multi_root}/etc" - for b in /lib /usr/lib /usr/local/lib; do + for b in /lib /usr/lib "${CT_LDSO_CONF_EXTRA_DIRS_ARRAY[@]}"; do d="${b}/${multi_os_dir}" CT_SanitizeVarDir d echo "${d}" >> "${multi_root}/etc/ld.so.conf" @@ -34,7 +34,7 @@ do_finish() { CT_DoStep INFO "Finalizing the toolchain's directory" - if [ "${CT_SHARED_LIBS}" = "y" ]; then + if [ "${CT_CREATE_LDSO_CONF}" = "y" ]; then # Create /etc/ld.so.conf CT_mkdir_pushd "${CT_BUILD_DIR}/build-create-ldso" CT_IterateMultilibs create_ldso_conf create-ldso |