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

Pedro Alves palves@redhat.com
Wed Jan 29 20:04:00 GMT 2020


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.)

Thanks,
Pedro Alves



More information about the Binutils mailing list