diff options
author | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2009-03-27 23:40:07 (GMT) |
---|---|---|
committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2009-03-27 23:40:07 (GMT) |
commit | 91a189c7ba35f9a723c986c3b90873db0f4366b9 (patch) | |
tree | 7fd0bff1a82c688b0f347461c31cebf9d5ef95d5 /scripts/build/libc | |
parent | 3a181fe51460375b8c08be8d86ff11f1c8e80855 (diff) |
Only create the state dir if asked for a restartable build:
- introduce the config dir, where components can store their config files
- move the munged uClibc config file to the config dir
- now, the state dir really is an indication that a build can be restarted
Thanks to Groleo Marius <groleo@gmail.com> for spotting the inconsistency
of the state dir usage, and suggesting this change.
/trunk/scripts/build/libc/uClibc.sh | 6 3 3 0 +++---
/trunk/scripts/crosstool-NG.sh.in | 9 7 2 0 +++++++--
/trunk/scripts/functions | 15 12 3 0 ++++++++++++---
3 files changed, 22 insertions(+), 8 deletions(-)
Diffstat (limited to 'scripts/build/libc')
-rw-r--r-- | scripts/build/libc/uClibc.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh index fcd06bd..c65606c 100644 --- a/scripts/build/libc/uClibc.sh +++ b/scripts/build/libc/uClibc.sh @@ -47,7 +47,7 @@ do_libc_check_config() { fi CT_DoLog EXTRA "Munging uClibc configuration" - mungeuClibcConfig "${CT_LIBC_UCLIBC_CONFIG_FILE}" "${CT_STATE_DIR}/uClibc.config" + mungeuClibcConfig "${CT_LIBC_UCLIBC_CONFIG_FILE}" "${CT_CONFIG_DIR}/uClibc.config" CT_EndStep } @@ -64,7 +64,7 @@ do_libc_headers() { { cd "${CT_SRC_DIR}/uClibc-${CT_LIBC_VERSION}"; tar cf - .; } |tar xf - # Retrieve the config file - cp "${CT_STATE_DIR}/uClibc.config" .config + cp "${CT_CONFIG_DIR}/uClibc.config" .config # uClibc uses the CROSS environment variable as a prefix to the # compiler tools to use. Setting it to the empty string forces @@ -99,7 +99,7 @@ do_libc() { { cd "${CT_SRC_DIR}/uClibc-${CT_LIBC_VERSION}"; tar cf - .; } |tar xf - # Retrieve the config file - cp "${CT_STATE_DIR}/uClibc.config" .config + cp "${CT_CONFIG_DIR}/uClibc.config" .config # uClibc uses the CROSS environment variable as a prefix to the compiler # tools to use. The newly built tools should be in our path, so we need |