1.1 --- a/scripts/build/libc/glibc-eglibc.sh-common	Tue May 31 20:55:30 2011 +0200
     1.2 +++ b/scripts/build/libc/glibc-eglibc.sh-common	Mon May 30 23:05:28 2011 +0200
     1.3 @@ -11,8 +11,13 @@
     1.4  
     1.5      # Extract the add-opns
     1.6      for addon in $(do_libc_add_ons_list " "); do
     1.7 -        # NPTL addon is not to be extracted, in any case
     1.8 -        [ "${addon}" = "nptl" ] && continue || true
     1.9 +        # If the addon was bundled with the main archive, we do not
    1.10 +        # need to extract it. Worse, if we were to try to extract
    1.11 +        # it, we'd get an error.
    1.12 +        if [ -d "${addon}" ]; then
    1.13 +            CT_DoLog DEBUG "Add-on already present, spkipping extraction"
    1.14 +            continue
    1.15 +        fi
    1.16  
    1.17          CT_Extract nochdir "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}"
    1.18