aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Lebedev <lebdron@gmail.com>2020-12-30 01:01:30 +0100
committerGitHub <noreply@github.com>2020-12-29 16:01:30 -0800
commitba70cea27a0a579c2065192ce474e626fa24ab61 (patch)
treee6dc65da642e873e5345a5bdaa6e615151f463ac
parentfc0a2aa44b7037ba824f4528cce0fc19b2e07914 (diff)
downloadvcpkg-ba70cea27a0a579c2065192ce474e626fa24ab61.tar.gz
vcpkg-ba70cea27a0a579c2065192ce474e626fa24ab61.zip
[grpc] Build codegen on arm64-osx (#15307)
Signed-off-by: Andrei Lebedev <lebdron@gmail.com>
-rw-r--r--ports/grpc/CONTROL4
-rw-r--r--ports/grpc/portfile.cmake2
2 files changed, 3 insertions, 3 deletions
diff --git a/ports/grpc/CONTROL b/ports/grpc/CONTROL
index f5954763e..208332e53 100644
--- a/ports/grpc/CONTROL
+++ b/ports/grpc/CONTROL
@@ -1,9 +1,9 @@
Source: grpc
Version: 1.33.1
-Port-Version: 1
+Port-Version: 2
Build-Depends: zlib, openssl, protobuf, c-ares (!uwp), upb, abseil, re2
Homepage: https://github.com/grpc/grpc
Description: An RPC library and framework
Feature: absl-sync
-Description: Use abseil synchronization module \ No newline at end of file
+Description: Use abseil synchronization module
diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake
index 8253fe3e6..648b41b61 100644
--- a/ports/grpc/portfile.cmake
+++ b/ports/grpc/portfile.cmake
@@ -21,7 +21,7 @@ vcpkg_from_github(
00012-fix-use-cxx17.patch
)
-if((NOT VCPKG_TARGET_IS_LINUX) AND (VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64"))
+if((NOT VCPKG_TARGET_IS_LINUX AND NOT VCPKG_TARGET_IS_OSX) AND (VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64"))
set(gRPC_BUILD_CODEGEN OFF)
else()
set(gRPC_BUILD_CODEGEN ON)