summaryrefslogtreecommitdiff
path: root/scripts/functions
diff options
context:
space:
mode:
authorAlexey Neyman <stilor@att.net>2017-03-13 06:01:23 (GMT)
committerAlexey Neyman <stilor@att.net>2017-03-13 08:08:13 (GMT)
commit11b52ab6d7aef83f624dccc81e0b479c5155fe31 (patch)
treed733452d526801596917ceb6958c51ae63ae56ac /scripts/functions
parentb090e0f74d1ca0c0c45ec416c139f709a8e28f61 (diff)
Create ld.so.conf
Also a fix for CT_IterateMultilibs: it didn't pass multi_os_dir_gcc, so it only worked if the caller did *not* declare it as a local variable. Signed-off-by: Alexey Neyman <stilor@att.net>
Diffstat (limited to 'scripts/functions')
-rw-r--r--scripts/functions17
1 files changed, 9 insertions, 8 deletions
diff --git a/scripts/functions b/scripts/functions
index 3ef7bf6..ab141d5 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -1750,13 +1750,14 @@ CT_IterateMultilibs() {
dir_postfix=_${multi_dir//\//_}
dir_postfix=${dir_postfix%_.}
CT_mkdir_pushd "${prefix}${dir_postfix}"
- $func multi_dir="${multi_dir}" \
- multi_os_dir="${multi_os_dir}" \
- multi_flags="${multi_flags}" \
- multi_root="${multi_root}" \
- multi_target="${multi_target}" \
- multi_index="${multi_index}" \
- multi_count="${#multilibs[@]}" \
+ $func multi_dir="${multi_dir}" \
+ multi_os_dir="${multi_os_dir}" \
+ multi_os_dir_gcc="${multi_os_dir_gcc}" \
+ multi_flags="${multi_flags}" \
+ multi_root="${multi_root}" \
+ multi_target="${multi_target}" \
+ multi_index="${multi_index}" \
+ multi_count="${#multilibs[@]}" \
"$@"
CT_Popd
multi_index=$((multi_index+1))
@@ -1819,7 +1820,7 @@ CT_SymlinkToolsMultilib()
# Helper (iterator) for CT_MultilibFixupLDSO
CT__FixupLDSO()
{
- local multi_dir multi_os_dir multi_root multi_flags multi_index multi_count
+ local multi_dir multi_os_dir multi_root multi_flags multi_index multi_count multi_target
local binary
local ldso ldso_l ldso_f ldso_d ldso_u multilib_dir