mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '2192ff84dd720968108bc1ca54e239f4c94eb61d'
* commit '2192ff84dd720968108bc1ca54e239f4c94eb61d': configure: Default to armasm for --toolchain=msvc when targeting arm Merged-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
commit
d9f3efd3d6
|
@ -3197,6 +3197,11 @@ case "$toolchain" in
|
||||||
ld_default="$source_path/compat/windows/mslink"
|
ld_default="$source_path/compat/windows/mslink"
|
||||||
nm_default="dumpbin -symbols"
|
nm_default="dumpbin -symbols"
|
||||||
ar_default="lib"
|
ar_default="lib"
|
||||||
|
case "$arch" in
|
||||||
|
arm*)
|
||||||
|
as_default="armasm"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
target_os_default="win32"
|
target_os_default="win32"
|
||||||
# Use a relative path for TMPDIR. This makes sure all the
|
# Use a relative path for TMPDIR. This makes sure all the
|
||||||
# ffconf temp files are written with a relative path, avoiding
|
# ffconf temp files are written with a relative path, avoiding
|
||||||
|
|
Loading…
Reference in New Issue