diff options
| author | Carl Eugen Hoyos <ceffmpeg@gmail.com> | 2019-04-20 00:12:34 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <ceffmpeg@gmail.com> | 2019-04-20 00:12:34 +0200 |
| commit | 48860df34df63bbe29f1bda2865024ec4889ae7c (patch) | |
| tree | 6f1632adaba5f318c6c683e6ee65528bad47fea5 | |
| parent | 838710bd6c5f65d436408c0737b49628f23f9ca9 (diff) | |
| download | ffmpeg-streaming-48860df34df63bbe29f1bda2865024ec4889ae7c.zip ffmpeg-streaming-48860df34df63bbe29f1bda2865024ec4889ae7c.tar.gz | |
configure: Add .exe suffix to toolchain calls.
Allows in-tree msvc compilation with wsl.
| -rwxr-xr-x | compat/windows/mslink | 2 | ||||
| -rwxr-xr-x | configure | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/compat/windows/mslink b/compat/windows/mslink index 07b2b3e..6cab090 100755 --- a/compat/windows/mslink +++ b/compat/windows/mslink @@ -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 $? @@ -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" |
