[FFmpeg-cvslog] configure: Add .exe suffix to toolchain calls.
Carl Eugen Hoyos
git at videolan.org
Sat Apr 20 01:14:15 EEST 2019
ffmpeg | branch: master | Carl Eugen Hoyos <ceffmpeg at gmail.com> | Sat Apr 20 00:12:34 2019 +0200| [48860df34df63bbe29f1bda2865024ec4889ae7c] | committer: Carl Eugen Hoyos
configure: Add .exe suffix to toolchain calls.
Allows in-tree msvc compilation with wsl.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=48860df34df63bbe29f1bda2865024ec4889ae7c
---
compat/windows/mslink | 2 +-
configure | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/compat/windows/mslink b/compat/windows/mslink
index 07b2b3e378..6cab090071 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 $?
diff --git a/configure b/configure
index e10e2c2c46..b122b27268 100755
--- 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"
More information about the ffmpeg-cvslog
mailing list