diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2018-10-03 13:51:01 +0200 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2018-10-04 11:21:36 +0200 |
| commit | a2b2927f72fdf31441fc49dbf4ff8ede3f1aa997 (patch) | |
| tree | 9da1376c71b9f53383ce95c40d1df3af96d4e97a | |
| parent | 409def0d7394d4582c4f2e9aaa62460feeac39b7 (diff) | |
fix backward compatibility mode on macos
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | templates/CMakeLists.txt.template | 4 | ||||
| -rwxr-xr-x | tools/run_tests/artifacts/build_artifact_csharp.sh | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7cf3ae9290..66799c456f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -119,8 +119,8 @@ endif() if(gRPC_BACKWARDS_COMPATIBILITY_MODE) add_definitions(-DGPR_BACKWARDS_COMPATIBILITY_MODE) if (_gRPC_PLATFORM_MAC) - # CMAKE_OSX_DEPLOYMENT_TARGET - add_definitions(-mmacosx-version-min=10.7) + # some C++11 constructs not supported before OS X 10.9 + set(CMAKE_OSX_DEPLOYMENT_TARGET 10.9) endif() endif() diff --git a/templates/CMakeLists.txt.template b/templates/CMakeLists.txt.template index 5fff74f128..1628493d00 100644 --- a/templates/CMakeLists.txt.template +++ b/templates/CMakeLists.txt.template @@ -168,8 +168,8 @@ if(gRPC_BACKWARDS_COMPATIBILITY_MODE) add_definitions(-DGPR_BACKWARDS_COMPATIBILITY_MODE) if (_gRPC_PLATFORM_MAC) - # CMAKE_OSX_DEPLOYMENT_TARGET - add_definitions(-mmacosx-version-min=10.7) + # some C++11 constructs not supported before OS X 10.9 + set(CMAKE_OSX_DEPLOYMENT_TARGET 10.9) endif() endif() diff --git a/tools/run_tests/artifacts/build_artifact_csharp.sh b/tools/run_tests/artifacts/build_artifact_csharp.sh index 6c946d7a22..f6630a709c 100755 --- a/tools/run_tests/artifacts/build_artifact_csharp.sh +++ b/tools/run_tests/artifacts/build_artifact_csharp.sh @@ -20,8 +20,7 @@ cd "$(dirname "$0")/../../.." mkdir -p cmake/build cd cmake/build -# -DgRPC_BACKWARDS_COMPATIBILITY_MODE=ON -cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DgRPC_BUILD_TESTS=OFF "${CMAKE_ARCH_OPTION}" ../.. +cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DgRPC_BACKWARDS_COMPATIBILITY_MODE=ON -DgRPC_BUILD_TESTS=OFF "${CMAKE_ARCH_OPTION}" ../.. make grpc_csharp_ext cd ../.. |