diff mbox series

[FFmpeg-devel] configure: add fallback to $arch in msvc assembler check.

Message ID 20210123125241.4491-1-Reimar.Doeffinger@gmx.de
State Accepted
Commit a16bcc13d9c9db484717c3c19980532fad11c2de
Headers show
Series [FFmpeg-devel] configure: add fallback to $arch in msvc assembler check.
Related show

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make success Make finished
andriy/PPC64_make_fate success Make fate finished

Commit Message

Reimar Döffinger Jan. 23, 2021, 12:52 p.m. UTC
Setting the defaults for $arch happens only later, so
the current code would not set AS correctly if --arch
was not specified on the command-line.
Fix it by adding an explicit fallback to $arch_default.
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--
2.30.0

Comments

Martin Storsjö Jan. 23, 2021, 1:14 p.m. UTC | #1
On Sat, 23 Jan 2021, Reimar Döffinger wrote:

> Setting the defaults for $arch happens only later, so
> the current code would not set AS correctly if --arch
> was not specified on the command-line.
> Fix it by adding an explicit fallback to $arch_default.
> ---
> configure | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/configure b/configure
> index 54fbbd6b5f..df298b4b9b 100755
> --- a/configure
> +++ b/configure
> @@ -4268,7 +4268,7 @@ case "$toolchain" in
>         ld_default="$source_path/compat/windows/mslink"
>         nm_default="dumpbin.exe -symbols"
>         ar_default="lib.exe"
> -        case "$arch" in
> +        case "${arch:-$arch_default}" in
>         aarch64|arm64)
>             as_default="armasm64.exe"
>             ;;
> --
> 2.30.0

LGTM, thanks!

// Martin
Josh Dekker Jan. 25, 2021, 8:09 a.m. UTC | #2
On 2021-01-23 14:14, Martin Storsjö wrote:
> On Sat, 23 Jan 2021, Reimar Döffinger wrote:
> 
>> Setting the defaults for $arch happens only later, so
>> the current code would not set AS correctly if --arch
>> was not specified on the command-line.
>> Fix it by adding an explicit fallback to $arch_default.
>> ---
>> configure | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/configure b/configure
>> index 54fbbd6b5f..df298b4b9b 100755
>> --- a/configure
>> +++ b/configure
>> @@ -4268,7 +4268,7 @@ case "$toolchain" in
>>         ld_default="$source_path/compat/windows/mslink"
>>         nm_default="dumpbin.exe -symbols"
>>         ar_default="lib.exe"
>> -        case "$arch" in
>> +        case "${arch:-$arch_default}" in
>>         aarch64|arm64)
>>             as_default="armasm64.exe"
>>             ;;
>> -- 
>> 2.30.0
> 
> LGTM, thanks!
> 
> // Martin

Thanks, pushed.
diff mbox series

Patch

diff --git a/configure b/configure
index 54fbbd6b5f..df298b4b9b 100755
--- a/configure
+++ b/configure
@@ -4268,7 +4268,7 @@  case "$toolchain" in
         ld_default="$source_path/compat/windows/mslink"
         nm_default="dumpbin.exe -symbols"
         ar_default="lib.exe"
-        case "$arch" in
+        case "${arch:-$arch_default}" in
         aarch64|arm64)
             as_default="armasm64.exe"
             ;;