mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-21 21:50:17 +08:00
b0fbae8b83
* [abseil] Enable dynamic build on Windows * re-fix arm build
24 lines
1.8 KiB
Diff
24 lines
1.8 KiB
Diff
diff --git a/absl/time/internal/cctz/src/zone_info_source.cc b/absl/time/internal/cctz/src/zone_info_source.cc
|
|
index 98ea161..3f75d56 100644
|
|
--- a/absl/time/internal/cctz/src/zone_info_source.cc
|
|
+++ b/absl/time/internal/cctz/src/zone_info_source.cc
|
|
@@ -65,7 +65,7 @@ ZoneInfoSourceFactory zone_info_source_factory __attribute__((weak)) =
|
|
extern ZoneInfoSourceFactory zone_info_source_factory;
|
|
extern ZoneInfoSourceFactory default_factory;
|
|
ZoneInfoSourceFactory default_factory = DefaultFactory;
|
|
-#if defined(_M_IX86)
|
|
+#if defined(_M_IX86) || ((defined(_M_ARM) || defined(_M_ARM64)) && defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP))
|
|
#pragma comment( \
|
|
linker, \
|
|
"/alternatename:?zone_info_source_factory@cctz_extension@time_internal@" ABSL_INTERNAL_MANGLED_NS \
|
|
@@ -83,7 +83,8 @@ ZoneInfoSourceFactory default_factory = DefaultFactory;
|
|
"@@U?$default_delete@VZoneInfoSource@cctz@time_internal@" ABSL_INTERNAL_MANGLED_NS \
|
|
"@@@std@@@std@@ABV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@@Z@" ABSL_INTERNAL_MANGLED_BACKREFERENCE \
|
|
"@@ZA")
|
|
-#elif defined(_M_IA_64) || defined(_M_AMD64) || defined(_M_ARM64)
|
|
+#elif defined(_M_IA_64) || defined(_M_AMD64) || defined(_M_ARM) || \
|
|
+ defined(_M_ARM64)
|
|
#pragma comment( \
|
|
linker, \
|
|
"/alternatename:?zone_info_source_factory@cctz_extension@time_internal@" ABSL_INTERNAL_MANGLED_NS \
|