Patchwork scripts: Select the correct "strip" to strip gdbserver for Canadian build

login
register
mail settings
Submitter Zhenqiang Chen
Date Sept. 20, 2012, 3:22 a.m.
Message ID <CACgzC7BU9CPZ2cE+EYqnMe2WNz-wYby6f4tsmjJi715WmPmbWw@mail.gmail.com>
Download mbox | patch
Permalink /patch/185303/
State Accepted
Commit f36c207348ef
Headers show

Comments

Zhenqiang Chen - Sept. 20, 2012, 3:22 a.m.
On 20 September 2012 05:04, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> Zhenqiang, Mike, All,
>
> On Wednesday 19 September 2012 10:56:18 Zhenqiang Chen wrote:
>> # HG changeset patch
>> # User Zhenqiang Chen <zhenqiang.chen@linaro.org>
>> # Date 1348044842 -28800
>> # Node ID 49dc965c5eada0b4bbef5f7810a259eae5773bb1
>> # Parent  2858a24a584642e263a920b4214c815c172ed547
>> scripts: Select the correct "strip" to strip gdbserver for Canadian build.
>>
>> For Canadian build, we can not run the bin/${CT_TARGET}-strip on the build
>> system. But ${CT_TARGET}-strip should be on PATH.
>>
>> Signed-off-by: Zhenqiang Chen <zhenqiang.chen@linaro.org>
>>
>> diff -r 2858a24a5846 -r 49dc965c5ead scripts/build/internals.sh
>> --- a/scripts/build/internals.sh      Sun Aug 12 07:45:42 2012 -0400
>> +++ b/scripts/build/internals.sh      Wed Sep 19 16:54:02 2012 +0800
>> @@ -25,8 +25,12 @@
>>
>>          # Strip gdbserver
>>          if [ "${CT_GDB_GDBSERVER}" = "y" ]; then
>> -           CT_DoExecLog ALL bin/${CT_TARGET}-strip ${strip_args}    \
>> -                            ${CT_TARGET}/debug-root/usr/bin/gdbserver
>> +            local cross_strip="bin/${CT_TARGET}-strip"
>> +            # For Canadian build, we can not run the bin/${CT_TARGET}-strip on
>> +            # the build system. But ${CT_TARGET}-strip should be on PATH.
>> +            [ "${CT_CANADIAN}" = "y" ] && cross_strip="${CT_TARGET}-strip"
>> +            CT_DoExecLog ALL ${cross_strip} ${strip_args}    \
>> +                             ${CT_TARGET}/debug-root/usr/bin/gdbserver
>
> Just call ${CT_TARGET}-strip :
>   - if in cross-mode, then we can run it from the final installation
>     location ${CT_PREFIX_DIR}/bin, which is in the $PATH
>   - if in canadian-mode, then we can run it from the 'host' binutils
>     that was build earlier, and isntalled in ${CT_BUILDTOOLS_DIR}/bin,
>     which is also in the $PATH
>
> Note: in cross-mode, both ${CT_PREFIX_DIR}/bin and ${CT_BUILDTOOLS_DIR}/bin
> are in the $PATH, in this order, to give precedence to the final location
> over the build-time-only tools. In canadian-mode, only the latter is in the
> $PATH, so we do not even have the possibility to run host code.
>
> Regards,
> Yann E. MORIN.

Thanks! Update it as:

exporting patch:
# HG changeset patch
# User Zhenqiang Chen <zhenqiang.chen@linaro.org>
# Date 1348111216 -28800
# Node ID 8724aedc7a30ac1e5c0a412747e5a88707da95a4
# Parent  2858a24a584642e263a920b4214c815c172ed547
scripts: Use ${CT_TARGET}-strip to strip gdbserver

Signed-off-by: Zhenqiang Chen <zhenqiang.chen@linaro.org>


--
For unsubscribe information see http://sourceware.org/lists.html#faq
Yann E. MORIN - Sept. 25, 2012, 9 p.m.
Zhenqiang, All,

Your patch:
    scripts: Use ${CT_TARGET}-strip to strip gdbserver

has been applied as #f36c207348ef. Thank you!

Regards,
Yann E. MORIN.



--
For unsubscribe information see http://sourceware.org/lists.html#faq

Patch

diff -r 2858a24a5846 -r 8724aedc7a30 scripts/build/internals.sh
--- a/scripts/build/internals.sh	Sun Aug 12 07:45:42 2012 -0400
+++ b/scripts/build/internals.sh	Thu Sep 20 11:20:16 2012 +0800
@@ -25,8 +25,8 @@ 

         # Strip gdbserver
         if [ "${CT_GDB_GDBSERVER}" = "y" ]; then
-           CT_DoExecLog ALL bin/${CT_TARGET}-strip ${strip_args}    \
-                            ${CT_TARGET}/debug-root/usr/bin/gdbserver
+            CT_DoExecLog ALL ${CT_TARGET}-strip ${strip_args}    \
+                             ${CT_TARGET}/debug-root/usr/bin/gdbserver
         fi
         # We can not use the version in CT_CC_VERSION because
         # of the Linaro stuff. So, harvest the version string