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/avr-libc.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/avr-libc.sh')
-rw-r--r-- | scripts/build/libc/avr-libc.sh | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/scripts/build/libc/avr-libc.sh b/scripts/build/libc/avr-libc.sh index 103a795..b73f990 100644 --- a/scripts/build/libc/avr-libc.sh +++ b/scripts/build/libc/avr-libc.sh @@ -6,24 +6,14 @@ do_libc_get() { libc_src="http://download.savannah.gnu.org/releases/avr-libc" if [ "${CT_LIBC_AVR_LIBC_CUSTOM}" = "y" ]; then - CT_GetCustom "avr-libc" "${CT_LIBC_VERSION}" \ - "${CT_LIBC_AVR_LIBC_CUSTOM_LOCATION}" + CT_GetCustom "avr-libc" "${CT_LIBC_AVR_LIBC_CUSTOM_VERSION}" \ + "${CT_LIBC_AVR_LIBC_CUSTOM_LOCATION}" else # ! custom location CT_GetFile "avr-libc-${CT_LIBC_VERSION}" "${libc_src}" fi # ! custom location } do_libc_extract() { - # If using custom directory location, nothing to do. - if [ "${CT_LIBC_AVR_LIBC_CUSTOM}" = "y" ]; then - # Abort if the custom directory is not found. - if ! [ -d "${CT_SRC_DIR}/avr-libc-${CT_LIBC_VERSION}" ]; then - CT_Abort "Directory not found: ${CT_SRC_DIR}/avr-libc-${CT_LIBC_VERSION}" - fi - - return 0 - fi - CT_Extract "avr-libc-${CT_LIBC_VERSION}" CT_Patch "avr-libc" "${CT_LIBC_VERSION}" } |