| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | From 619ada314ab26c0c9cbfe5702cd9c0caa8f6415a Mon Sep 17 00:00:00 2001 |
| 2 | From: Wenzong Fan <wenzong.fan@windriver.com> |
| 3 | Date: Mon, 3 Aug 2015 17:12:33 +0800 |
| 4 | Subject: [PATCH] bjam-native: build bjam.debug |
| 5 | |
| 6 | bjam is stripped by default, this causes QA warning while stripping it |
| 7 | from do_populate_sysroot(): |
| 8 | |
| 9 | WARNING: File '.../tmp/sysroots/x86_64-linux/usr/bin/bjam' \ |
| 10 | from bjam-native was already stripped, \ |
| 11 | this will prevent future debugging! |
| 12 | |
| 13 | The JAM scripts allow to build unstripped version with '--debug'. Just |
| 14 | build and install the bjam.debug to stop bjam from being stripped in |
| 15 | compile step. |
| 16 | |
| 17 | Upstream-Status: Inappropriate [configuration] |
| 18 | |
| 19 | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> |
| 20 | --- |
| 21 | bootstrap.sh | 1 + |
| 22 | tools/build/src/engine/build.sh | 2 +- |
| 23 | 2 files changed, 2 insertions(+), 1 deletion(-) |
| 24 | |
| 25 | diff --git a/bootstrap.sh b/bootstrap.sh |
| 26 | index 98cf88b..54690aa 100755 |
| 27 | --- a/bootstrap.sh |
| 28 | +++ b/bootstrap.sh |
| 29 | @@ -228,6 +228,7 @@ if test "x$BJAM" = x; then |
| 30 | echo "tools/build/src/engine/$arch/b2" |
| 31 | cp "$BJAM" . |
| 32 | cp "$my_dir/tools/build/src/engine/$arch/bjam" . |
| 33 | + cp "$my_dir/tools/build/src/engine/${arch}.debug/bjam" bjam.debug |
| 34 | |
| 35 | fi |
| 36 | |
| 37 | diff --git a/tools/build/src/engine/build.sh b/tools/build/src/engine/build.sh |
| 38 | index 6dbc706..c69fdc7 100755 |
| 39 | --- a/tools/build/src/engine/build.sh |
| 40 | +++ b/tools/build/src/engine/build.sh |
| 41 | @@ -312,5 +312,5 @@ if test -x "./bootstrap/jam0" ; then |
| 42 | if test "${BJAM_UPDATE}" != "update" ; then |
| 43 | echo_run ./bootstrap/jam0 -f build.jam --toolset=$BOOST_JAM_TOOLSET "--toolset-root=$BOOST_JAM_TOOLSET_ROOT" "$@" clean |
| 44 | fi |
| 45 | - echo_run ./bootstrap/jam0 -f build.jam --toolset=$BOOST_JAM_TOOLSET "--toolset-root=$BOOST_JAM_TOOLSET_ROOT" "$@" |
| 46 | + echo_run ./bootstrap/jam0 -f build.jam --toolset=$BOOST_JAM_TOOLSET "--toolset-root=$BOOST_JAM_TOOLSET_ROOT" "$@" --debug |
| 47 | fi |
| 48 | -- |
| 49 | 1.9.1 |
| 50 | |