[x264-devel] [Git][videolan/x264][master] configure: Fix building under the MSYS shell

[Anton Mitrofanov]

Anton Mitrofanov pushed to branch master at VideoLAN / x264


Commits:
d1fee1e0 by JHammler at 2020-06-15T21:57:16+02:00
configure: Fix building under the MSYS shell

- - - - -


2 changed files:

- config.guess
- configure


Changes:

=====================================
config.guess
=====================================
@@ -811,7 +811,7 @@ EOF
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
-    i*:MSYS*:*)
+    *:MSYS*:*)
 	echo ${UNAME_MACHINE}-pc-msys
 	exit ;;
     i*:windows32*:*)


=====================================
configure
=====================================
@@ -574,7 +574,7 @@ trap 'rm -rf conftest*' EXIT
 # test for use of compilers that require specific handling
 cc_base="$(basename "$CC")"
 QPRE="-"
-if [[ $host_os = mingw* || $host_os = cygwin* ]]; then
+if [[ $host_os = mingw* || $host_os = msys* || $host_os = cygwin* ]]; then
     if [[ "$cc_base" = icl || "$cc_base" = icl[\ .]* ]]; then
         # Windows Intel Compiler creates dependency generation with absolute Windows paths, Cygwin's make does not support Windows paths.
         [[ $host_os = cygwin* ]] && die "Windows Intel Compiler support requires MSYS"



View it on GitLab: https://code.videolan.org/videolan/x264/-/commit/d1fee1e05249c84f642c13b6af010c331af21e1c

-- 
View it on GitLab: https://code.videolan.org/videolan/x264/-/commit/d1fee1e05249c84f642c13b6af010c331af21e1c
You're receiving this email because of your account on code.videolan.org.