mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 07:19:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix llvm-tblgen build with MSVC v19.26 (#11703)

Browse Source
This commit is contained in:
yurybura 2020-06-03 08:39:30 +03:00 committed by GitHub
parent 3defadc616
commit d7efa11dd0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ports/llvm/0003-fix-vs2019-v16.6.patch Normal file
View File

@ -0,0 +1,15 @@
diff --git a/llvm/include/llvm/Support/ManagedStatic.h b/llvm/include/llvm/Support/ManagedStatic.h
index bbd0d04ed..f2b41422f 100644
--- a/llvm/include/llvm/Support/ManagedStatic.h
+++ b/llvm/include/llvm/Support/ManagedStatic.h
@@ -40,8 +40,8 @@ template <typename T, size_t N> struct object_deleter<T[N]> {
// constexpr, a dynamic initializer may be emitted depending on optimization
// settings. For the affected versions of MSVC, use the old linker
// initialization pattern of not providing a constructor and leaving the fields
-// uninitialized.
-#if !defined(_MSC_VER) || defined(__clang__)
+// uninitialized. See http://llvm.org/PR41367 for details.
+#if !defined(_MSC_VER) || (_MSC_VER >= 1925) || defined(__clang__)
#define LLVM_USE_CONSTEXPR_CTOR
#endif

2
ports/llvm/CONTROL
View File

@ -1,5 +1,5 @@
Source: llvm
Version: 10.0.0-2
Version: 10.0.0-3
Homepage: https://llvm.org/
Description: The LLVM Compiler Infrastructure
Supports: !uwp

1
ports/llvm/portfile.cmake
View File

@ -13,6 +13,7 @@ vcpkg_from_github(
PATCHES
0001-allow-to-use-commas.patch
0002-fix-install-paths.patch
0003-fix-vs2019-v16.6.patch
)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS