]> git.sesse.net Git - ffmpeg/commitdiff
configure: Add .exe suffix to toolchain calls.
authorCarl Eugen Hoyos <ceffmpeg@gmail.com>
Fri, 19 Apr 2019 22:12:34 +0000 (00:12 +0200)
committerCarl Eugen Hoyos <ceffmpeg@gmail.com>
Fri, 19 Apr 2019 22:12:34 +0000 (00:12 +0200)
Allows in-tree msvc compilation with wsl.

compat/windows/mslink
configure

index 07b2b3e3787cdda7dfe5d902db931d124c46a29c..6cab090071da6646a33137d00faba333673dfed4 100755 (executable)
@@ -4,6 +4,6 @@ LINK_EXE_PATH=$(dirname "$(command -v cl)")/link
 if [ -x "$LINK_EXE_PATH" ]; then
     "$LINK_EXE_PATH" $@
 else
-    link $@
+    link.exe $@
 fi
 exit $?
index e10e2c2c4694a42b777f7b9060f7eaafc5c63b6f..b122b272681ea00952bb8c6fdc70bdae36220ea4 100755 (executable)
--- a/configure
+++ b/configure
@@ -4112,22 +4112,22 @@ case "$toolchain" in
         # behaviour if the regexp was unable to match anything, since this
         # successfully parses the version number of existing supported
         # versions that require the converter (MSVC 2010 and 2012).
-        cl_major_ver=$(cl 2>&1 | sed -n 's/.*Version \([[:digit:]]\{1,\}\)\..*/\1/p')
+        cl_major_ver=$(cl.exe 2>&1 | sed -n 's/.*Version \([[:digit:]]\{1,\}\)\..*/\1/p')
         if [ -z "$cl_major_ver" ] || [ $cl_major_ver -ge 18 ]; then
-            cc_default="cl"
-            cxx_default="cl"
+            cc_default="cl.exe"
+            cxx_default="cl.exe"
         else
             die "Unsupported MSVC version (2013 or newer required)"
         fi
         ld_default="$source_path/compat/windows/mslink"
-        nm_default="dumpbin -symbols"
-        ar_default="lib"
+        nm_default="dumpbin.exe -symbols"
+        ar_default="lib.exe"
         case "$arch" in
         aarch64|arm64)
-            as_default="armasm64"
+            as_default="armasm64.exe"
             ;;
         arm*)
-            as_default="armasm"
+            as_default="armasm.exe"
             ;;
         esac
         target_os_default="win32"