diff options
| author |   Alexey Neyman <stilor@att.net> | 2017-03-22 17:54:37 (GMT) |
|---|---|---|
| committer | Alexey Neyman <stilor@att.net> | 2017-03-22 17:57:45 (GMT) |
| commit | 3d1678a7f65ae541eba7114fe7447c38c7d9259d (patch) | |
| tree | f4c71fb52cb49dcd402fb10c63733c74c97cd994 /scripts/build/internals.sh | |
| parent | 91169535d7071eca5e459c96d3287e5f2d17114e (diff) | |
Make creation of ld.so.conf optional
... enabled by default for multilib and disabled otherwise. Buildroot
has been complaining about /etc/ld.so.conf presence for almost a year
now and I missed that.
After the release, xldd will be modified to query the compiler for
the list of multilibs to search. This would be too invasive change
before 1.23, though.
Note that it may lead to configurations where xldd currently does not
find the libraries (if both DEMULTILIB and CREATE_LDSO_CONF are turned
off). This is not the default setting in Kconfig, though.
Signed-off-by: Alexey Neyman <stilor@att.net>
Diffstat (limited to 'scripts/build/internals.sh')
| -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 |