summaryrefslogtreecommitdiff
path: root/scripts/build/libc
diff options
context:
space:
mode:
authorDavid Holsgrove <david.holsgrove@xilinx.com>2014-12-09 03:58:12 (GMT)
committerDavid Holsgrove <david.holsgrove@xilinx.com>2014-12-09 04:41:35 (GMT)
commitd7b4f0dbe3d6a17cc736fb4879c241890f4d73b7 (patch)
tree4d214b29ab0fdd1cabaa7d16d4f3cc3c2b5d39bd /scripts/build/libc
parentf1bdbe995b8a06e2888020e74c8abdfaaa8d41da (diff)
glibc: nptl is default from 2.20, so dont add to addons_list
No longer recommended practice to use --enable-add-ons=nptl, so for 2.20 and later (along with custom glibc), don't add the CT_THREADS to the addons_list https://sourceware.org/glibc/wiki/Release/2.20#Packaging_Changes Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com>
Diffstat (limited to 'scripts/build/libc')
-rw-r--r--scripts/build/libc/glibc-eglibc.sh-common10
1 files changed, 6 insertions, 4 deletions
diff --git a/scripts/build/libc/glibc-eglibc.sh-common b/scripts/build/libc/glibc-eglibc.sh-common
index 4d961fd..af3b1f1 100644
--- a/scripts/build/libc/glibc-eglibc.sh-common
+++ b/scripts/build/libc/glibc-eglibc.sh-common
@@ -487,10 +487,12 @@ do_libc_add_ons_list() {
local addons_list="$( echo "${CT_LIBC_ADDONS_LIST}" \
|sed -r -e "s/[[:space:],]/${sep}/g;" \
)"
- case "${CT_THREADS}" in
- none) ;;
- *) addons_list="${addons_list}${sep}${CT_THREADS}";;
- esac
+ if [ "${CT_LIBC_GLIBC_2_20_or_later}" != "y" ]; then
+ case "${CT_THREADS}" in
+ none) ;;
+ *) addons_list="${addons_list}${sep}${CT_THREADS}";;
+ esac
+ fi
[ "${CT_LIBC_GLIBC_USE_PORTS}" = "y" ] && addons_list="${addons_list}${sep}ports"
# Remove duplicate, leading and trailing separators
echo "${addons_list}" |sed -r -e "s/${sep}+/${sep}/g; s/^${sep}//; s/${sep}\$//;"