diff options
| author |   Yann E. MORIN" <yann.morin.1998@free.fr> | 2013-12-31 11:55:21 (GMT) |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@free.fr> | 2013-12-31 11:55:21 (GMT) |
| commit | 2c2717a0190581f3143bd76a107f4cb5316e3c2e (patch) | |
| tree | 2ea6df490b3c6d9f08f227586dab2176024f17e6 | |
| parent | d1ff75f4dc5706d1d41ff7c315a9001a53a01764 (diff) | |
libc/newlib: fix variables for avr32 headers
Some of the avr32headers related variables are used in different
functions, so have to be declared globally, not locally.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
| -rw-r--r-- | scripts/build/libc/newlib.sh | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/scripts/build/libc/newlib.sh b/scripts/build/libc/newlib.sh index 35b20c7..fa6d622 100644 --- a/scripts/build/libc/newlib.sh +++ b/scripts/build/libc/newlib.sh @@ -5,11 +5,12 @@ # Edited by Martin Lund <mgl@doredevelopment.dk> # +LIBC_NEWLIB_AVR_HDRS_URI="http://www.atmel.com/Images" +LIBC_NEWLIB_AVR_HDRS_BASE="avr-headers-3.2.3.970" +LIBC_NEWLIB_AVR_HDRS_EXT=".zip" + do_libc_get() { local libc_src="ftp://sourceware.org/pub/newlib" - local avr32headers_src="http://www.atmel.com/Images" - avr32headers_base="avr-headers-3.2.3.970" # used below - local avr32headers_ext=".zip" if [ "${CT_LIBC_NEWLIB_CUSTOM}" = "y" ]; then CT_GetCustom "newlib" "${CT_LIBC_VERSION}" \ @@ -20,7 +21,9 @@ do_libc_get() { fi # ! custom location if [ "${CT_ATMEL_AVR32_HEADERS}" = "y" ]; then - CT_GetFile ${avr32headers_base} ${avr32headers_ext} ${avr32headers_src} + CT_GetFile ${LIBC_NEWLIB_AVR_HDRS_BASE} \ + ${LIBC_NEWLIB_AVR_HDRS_EXT} \ + ${LIBC_NEWLIB_AVR_HDRS_URI} fi } @@ -37,7 +40,8 @@ do_libc_extract() { if [ "${CT_ATMEL_AVR32_HEADERS}" = "y" ]; then # The avr32header zip file extracts to avr32/*.h # Put that in its directory, the same as normal tarballs - CT_Extract ${avr32headers_base} -d ${CT_SRC_DIR}/${avr32headers_base} + CT_Extract ${LIBC_NEWLIB_AVR_HDRS_BASE} \ + -d ${CT_SRC_DIR}/${LIBC_NEWLIB_AVR_HDRS_BASE} fi } @@ -51,7 +55,7 @@ do_libc_start_files() { CT_DoLog EXTRA "Installing Atmel's AVR32 headers" CT_DoExecLog ALL mkdir -p "${CT_PREFIX_DIR}/${CT_TARGET}/include" - CT_DoExecLog ALL cp -r "${CT_SRC_DIR}/${avr32headers_base}/avr32" \ + CT_DoExecLog ALL cp -r "${CT_SRC_DIR}/${LIBC_NEWLIB_AVR_HDRS_BASE}/avr32" \ "${CT_PREFIX_DIR}/${CT_TARGET}/include/" CT_EndStep |