diff options
| author |   Bryan Hundven <bryanhundven@gmail.com> | 2015-12-18 09:42:09 (GMT) |
|---|---|---|
| committer | Bryan Hundven <bryanhundven@gmail.com> | 2015-12-18 09:42:09 (GMT) |
| commit | 7f949eafaf8167855b7749910e1aa304f5316edb (patch) | |
| tree | 115b1bca266d57cc7e2c0940fd4f14ca415a888d /scripts/build/libc/newlib.sh | |
| parent | 2d3c70dd3ddc5a569c0fa1a833fd5920029b5794 (diff) | |
| parent | 9f89e082c5bcb3c49013eeeae0a1ccbac1d91ba9 (diff) | |
Merge pull request #288 from bhundven/custom_locations_rewrite
Custom locations rewrite
Diffstat (limited to 'scripts/build/libc/newlib.sh')
| -rw-r--r-- | scripts/build/libc/newlib.sh | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/scripts/build/libc/newlib.sh b/scripts/build/libc/newlib.sh index a4fe82e..ba52268 100644 --- a/scripts/build/libc/newlib.sh +++ b/scripts/build/libc/newlib.sh @@ -14,8 +14,8 @@ do_libc_get() { ftp://sourceware.org/pub/newlib}" if [ "${CT_LIBC_NEWLIB_CUSTOM}" = "y" ]; then - CT_GetCustom "newlib" "${CT_LIBC_VERSION}" \ - "${CT_LIBC_NEWLIB_CUSTOM_LOCATION}" + CT_GetCustom "newlib" "${CT_LIBC_NEWLIB_CUSTOM_VERSION}" \ + "${CT_LIBC_NEWLIB_CUSTOM_LOCATION}" else # ! custom location if echo ${CT_LIBC_VERSION} |${grep} -q linaro; then YYMM=`echo ${CT_LIBC_VERSION} |cut -d- -f3 |${sed} -e 's,^..,,'` @@ -30,12 +30,6 @@ do_libc_get() { } do_libc_extract() { - # If using custom directory location, nothing to do - if [ "${CT_LIBC_NEWLIB_CUSTOM}" = "y" \ - -a -d "${CT_SRC_DIR}/newlib-${CT_LIBC_VERSION}" ]; then - return 0 - fi - CT_Extract "newlib-${CT_LIBC_VERSION}" CT_Patch "newlib" "${CT_LIBC_VERSION}" |