diff options
| author | Johannes Stezenbach <js@sig21.net> | 2012-10-14 23:46:15 +0000 |
|---|---|---|
| committer | Johannes Stezenbach <js@sig21.net> | 2012-10-14 23:46:15 +0000 |
| commit | df3be9eef3cc4e0b111d25d75b12fa5ed69a3c1d (patch) | |
| tree | 1a71f7da6b63313e48ed00074db941d3fb149e21 | |
| parent | 899981e4c4917a591a5fe4426dbc075e3417795d (diff) | |
| download | crosstool-ng-df3be9eef3cc4e0b111d25d75b12fa5ed69a3c1d.tar.gz crosstool-ng-df3be9eef3cc4e0b111d25d75b12fa5ed69a3c1d.tar.bz2 crosstool-ng-df3be9eef3cc4e0b111d25d75b12fa5ed69a3c1d.zip | |
scripts: move backtrace marker to CT_WORK_DIR
Avoid error when commands in scripts/crosstool-NG.sh fail
before CT_BUILD_DIR is set.
So we need to remove the backtrace marker of a potential previous
build. Previously, it was implicitly removed because we did remove
the directory it was in, which is no longer the case.
Signed-off-by: Johannes Stezenbach <js@sig21.net>
[yann.morin.1998@free.fr: remove backtrace marker on start of build]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Message-Id: <20121015094615.GA18673@sig21.net>
Patchwork-Id: 191498
| -rw-r--r-- | scripts/crosstool-NG.sh.in | 1 | ||||
| -rw-r--r-- | scripts/functions | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/scripts/crosstool-NG.sh.in b/scripts/crosstool-NG.sh.in index 269787a1..1f1ffdbf 100644 --- a/scripts/crosstool-NG.sh.in +++ b/scripts/crosstool-NG.sh.in @@ -64,6 +64,7 @@ done # Where will we work? CT_WORK_DIR="${CT_WORK_DIR:-${CT_TOP_DIR}/.build}" CT_DoExecLog ALL mkdir -p "${CT_WORK_DIR}" +CT_DoExecLog DEBUG rm -f "${CT_WORK_DIR}/backtrace" # Check build file system case-sensitiveness CT_DoExecLog DEBUG touch "${CT_WORK_DIR}/foo" diff --git a/scripts/functions b/scripts/functions index 9a47688b..51807264 100644 --- a/scripts/functions +++ b/scripts/functions @@ -11,8 +11,8 @@ CT_OnError() { # To avoid printing the backtace for each sub-shell # up to the top-level, just remember we've dumped it - if [ ! -f "${CT_BUILD_DIR}/backtrace" ]; then - touch "${CT_BUILD_DIR}/backtrace" + if [ ! -f "${CT_WORK_DIR}/backtrace" ]; then + touch "${CT_WORK_DIR}/backtrace" # Print steps backtrace step_depth=${CT_STEP_COUNT} @@ -50,7 +50,7 @@ CT_OnError() { CT_DoLog ERROR "" CT_DoEnd ERROR - rm -f "${CT_BUILD_DIR}/backtrace" + rm -f "${CT_WORK_DIR}/backtrace" fi exit $ret } |