ExternalVendorCode/crosstool-ng
1
0
Fork 0
mirror of https://github.com/crosstool-ng/crosstool-ng.git synced 2024-12-19 12:57:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

scripts/populate: fix handling the forced libraries list-file

Browse Source 
If a list-file is used, then each library in the file will be handled
twice (not a real issue, as the second iteration will find the library
already present, just avoid doing the job twice).
This commit is contained in:
Yann E. MORIN" 2010-03-26 23:17:23 +01:00
parent f36ceb7f54
commit 1913d355b3
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/populate.in
View File

@ -206,6 +206,7 @@ do_add_lib() {
pushd "${CT_ROOT_DST_DIR}" >/dev/null pushd "${CT_ROOT_DST_DIR}" >/dev/null
# First of, copy the forced libraries into the working copy # First of, copy the forced libraries into the working copy
lib_list=
if [ -n "${CT_LIB_FILE}" ]; then if [ -n "${CT_LIB_FILE}" ]; then
lib_list=$("${sed}" -r -e ':loop; s/#.*//;' \ lib_list=$("${sed}" -r -e ':loop; s/#.*//;' \
-e 's/[[:space:]]+//g;' \ -e 's/[[:space:]]+//g;' \
@ -213,9 +214,6 @@ if [ -n "${CT_LIB_FILE}" ]; then
-e '/$/N; s/\n//; tloop;' \ -e '/$/N; s/\n//; tloop;' \
"${CT_LIB_FILE}" "${CT_LIB_FILE}"
) )
CT_LIB_LIST=$(echo "${CT_LIB_LIST}:${lib_list}" \
|"${sed}" -r -e 's/:+/:/g; s/^:+//; s/:+$//;' \
)
fi fi
CT_LIB_LIST=$(echo "${CT_LIB_LIST}:${lib_list}" \ CT_LIB_LIST=$(echo "${CT_LIB_LIST}:${lib_list}" \
|"${sed}" -r -e 's/^:+//; s/:+$//; s/:+/ /g;' \ |"${sed}" -r -e 's/^:+//; s/:+$//; s/:+/ /g;' \