aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2015-07-24 23:23:29 +0300
committerMartin Storsjö <martin@martin.st>2015-07-27 10:45:08 +0300
commit2192ff84dd720968108bc1ca54e239f4c94eb61d (patch)
treec442229a723f9e51fdf6676eb27578082bf74a1d
parente4015b00d4e9e40dc1693a018edd51bf7a04993e (diff)
downloadffmpeg-2192ff84dd720968108bc1ca54e239f4c94eb61d.tar.gz
configure: Default to armasm for --toolchain=msvc when targeting arm
Signed-off-by: Martin Storsjö <martin@martin.st>
-rwxr-xr-xconfigure5
1 files changed, 5 insertions, 0 deletions
diff --git a/configure b/configure
index 56459361f3..73f4e180da 100755
--- a/configure
+++ b/configure
@@ -2642,6 +2642,11 @@ case "$toolchain" in
ld_default="$source_path/compat/windows/mslink"
nm_default="dumpbin -symbols"
ar_default="lib"
+ case "$arch" in
+ arm*)
+ as_default="armasm"
+ ;;
+ esac
target_os_default="win32"
# Use a relative path for TMPDIR. This makes sure all the
# ffconf temp files are written with a relative path, avoiding