mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-05 09:59:06 +08:00
c805a5311a
* Avoid race in x264 install step * Drop pointless port pthread dependency * Update homepage and license * Revise portfile * Add 'tool' feature * Add clang-cl patch * Pass compiler and cross-build prefix * Update to r3095, follow pc file versioning * Add feature 'asm', enable it for arm64-windows * Update versions Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Co-authored-by: Billy O'Neal <bion@microsoft.com>
17 lines
949 B
Diff
17 lines
949 B
Diff
diff --git a/configure b/configure
|
|
index 6f95e2314..e677e36f4 100644
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -606,9 +606,9 @@ if [[ $host_os = mingw* || $host_os = msys* || $host_os = cygwin* ]]; then
|
|
if cc_check '' -Qdiag-error:10006,10157 ; then
|
|
CHECK_CFLAGS="$CHECK_CFLAGS -Qdiag-error:10006,10157"
|
|
fi
|
|
- elif [[ "$cc_base" = cl || "$cc_base" = cl[\ .]* ]]; then
|
|
+ elif [[ "$cc_base" = cl || "$cc_base" = cl[\ .]* || "$cc_base" = clang-cl || "$cc_base" = clang-cl[\ .]* ]]; then
|
|
# Standard Microsoft Visual Studio
|
|
compiler=CL
|
|
compiler_style=MS
|
|
+ CFLAGS="$CPPFLAGS $CFLAGS -nologo -GS- -DHAVE_STRING_H -I\$(SRCPATH)/extras"
|
|
- CFLAGS="$CFLAGS -nologo -GS- -DHAVE_STRING_H -I\$(SRCPATH)/extras"
|
|
cpp_check '' '' '_MSC_VER > 1800 || (_MSC_VER == 1800 && _MSC_FULL_VER >= 180030324)' || die "Microsoft Visual Studio support requires Visual Studio 2013 Update 2 or newer"
|