Re: [PATCH] Adjust src-release.sh's getver due to gdbsupport's move to toplevel

[Sergio Durigan Junior <sergiodj at redhat dot com>]

On Wednesday, January 29 2020, Pedro Alves wrote:

> On 1/29/20 7:58 PM, Sergio Durigan Junior wrote:
>> On Wednesday, January 29 2020, Pedro Alves wrote:
>> 
>>> On 1/28/20 10:25 PM, Sergio Durigan Junior wrote:
>>>
>>>> diff --git a/src-release.sh b/src-release.sh
>>>> index 92e92ac5d7..b3ca5ae137 100755
>>>> --- a/src-release.sh
>>>> +++ b/src-release.sh
>>>> @@ -61,8 +61,8 @@ getver()
>>>>  	$tool/common/create-version.sh $tool 'dummy-host' 'dummy-target' VER.tmp
>>>>  	cat VER.tmp | grep 'version\[\]' | sed 's/.*"\([^"]*\)".*/\1/' | sed 's/-git$//'
>>>>          rm -f VER.tmp
>>>> -    elif test -f $tool/gdbsupport/create-version.sh; then
>>>> -	$tool/gdbsupport/create-version.sh $tool 'dummy-host' 'dummy-target' VER.tmp
>>>> +    elif test -f ./gdbsupport/create-version.sh; then
>>>> +	./gdbsupport/create-version.sh $tool 'dummy-host' 'dummy-target' VER.tmp
>>>
>>> It seems like this makes it so that the version.in fallback becomes unreachable.
>>> ./gdbsupport/create-version.sh is always going to exist irrespective of what
>>> $tool is.  Maybe it would be better to check that $tool is "gdb" instead.
>> 
>> Ah, good catch.  Thanks.
>> 
>> Updated patch below.
>
> OK.
>
> (Be sure to strip the "OK?" from the pushed commit.)

Done.

Pushed: fc1ca146f76eea0b76b1392ea1a7aa8fb0742490

Thanks,

-- 
Sergio
GPG key ID: 237A 54B1 0287 28BF 00EF  31F4 D0EB 7628 65FC 5E36
Please send encrypted e-mail if possible
http://sergiodj.net/