virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-23 04:24:35 +02:00
Code Issues Releases Activity

configure: Add .exe suffix to toolchain calls.

Browse Source 
Allows in-tree msvc compilation with wsl.
This commit is contained in:
Carl Eugen Hoyos 2019-04-20 00:12:34 +02:00
parent 838710bd6c
commit 48860df34d
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compat/windows/mslink
View File

@ -4,6 +4,6 @@ LINK_EXE_PATH=$(dirname "$(command -v cl)")/link
if [ -x "$LINK_EXE_PATH" ]; then if [ -x "$LINK_EXE_PATH" ]; then
"$LINK_EXE_PATH" $@ "$LINK_EXE_PATH" $@
else else
link $@ link.exe $@
fi fi
exit $? exit $?

14
configure vendored
View File

@ -4112,22 +4112,22 @@ case "$toolchain" in
# behaviour if the regexp was unable to match anything, since this # behaviour if the regexp was unable to match anything, since this
# successfully parses the version number of existing supported # successfully parses the version number of existing supported
# versions that require the converter (MSVC 2010 and 2012). # 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 if [ -z "$cl_major_ver" ] || [ $cl_major_ver -ge 18 ]; then
cc_default="cl" cc_default="cl.exe"
cxx_default="cl" cxx_default="cl.exe"
else else
die "Unsupported MSVC version (2013 or newer required)" die "Unsupported MSVC version (2013 or newer required)"
fi fi
ld_default="$source_path/compat/windows/mslink" ld_default="$source_path/compat/windows/mslink"
nm_default="dumpbin -symbols" nm_default="dumpbin.exe -symbols"
ar_default="lib" ar_default="lib.exe"
case "$arch" in case "$arch" in
aarch64|arm64) aarch64|arm64)
as_default="armasm64" as_default="armasm64.exe"
;; ;;
arm*) arm*)
as_default="armasm" as_default="armasm.exe"
;; ;;
esac esac
target_os_default="win32" target_os_default="win32"