Skip to content

ARROW-16788: [C++] Remove hardening flags gRPC doesn't support #13346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kou merged 4 commits into from
Jun 11, 2022
Merged

ARROW-16788: [C++] Remove hardening flags gRPC doesn't support #13346

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
66f00f3
ARROW-16788: [C++] Remove hardening flags gRPC doesn't support
lidavidm Jun 8, 2022
4628035
Address feedback
lidavidm Jun 8, 2022
2c66232
Fix dumb mistake
lidavidm Jun 9, 2022
8b8a8f9
Fix style
lidavidm Jun 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions cpp/cmake_modules/ThirdpartyToolchain.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3657,8 +3657,25 @@ macro(build_grpc)
# Yuck, see https://stackoverflow.com/a/45433229/776560
string(REPLACE ";" "|" GRPC_PREFIX_PATH_ALT_SEP "${GRPC_CMAKE_PREFIX}")

set(GRPC_C_FLAGS "${EP_C_FLAGS}")
set(GRPC_CXX_FLAGS "${EP_CXX_FLAGS}")
if(NOT MSVC)
# Negate warnings that gRPC cannot build under
# See https://github.com/grpc/grpc/issues/29417
set(GRPC_C_FLAGS
"${GRPC_C_FLAGS} -Wno-attributes -Wno-format-security -Wno-unknown-warning-option"
)
set(GRPC_CXX_FLAGS
"${GRPC_CXX_FLAGS} -Wno-attributes -Wno-format-security -Wno-unknown-warning-option"
)
endif()
Copy link
Member

@kou kou Jun 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to initialize GRPC_C*_FLAGS for MSVC.

e.g.:

set(GRPC_C_FLAGS "${EP_C_FLAGS}")
set(GRPC_CXX_FLAGS "${EP_CXX_FLAGS}")
if(NOT MSVC)
  set(GRPC_C_FLAGS "${GRPC_C_FLAGS} ...")
  set(GRPC_CXX_FLAGS "${GRPC_CXX_FLAGS} ...")
endif()

Or

set(GRPC_CMAKE_ARGS ...)
if(NOT MSVC)
  set(GRPC_C_FLAGS "${EP_C_FLAGS} ...")
  set(GRPC_CXX_FLAGS "${EP_CXX_FLAGS} ...")
  list(APPEND GRPC_CMAKE_ARGS "-DCMAKE_C_FLAGS=${GRPC_C_FLAGS}" ...)
endif()

Copy link
Member Author

@lidavidm lidavidm Jun 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

D'oh…thanks for catching that


set(GRPC_CMAKE_ARGS
"${EP_COMMON_CMAKE_ARGS}"
"-DCMAKE_C_FLAGS=${GRPC_C_FLAGS}"
"-DCMAKE_CXX_FLAGS=${GRPC_CXX_FLAGS}"
"-DCMAKE_C_FLAGS_${UPPERCASE_BUILD_TYPE}=${GRPC_C_FLAGS}"
"-DCMAKE_CXX_FLAGS_${UPPERCASE_BUILD_TYPE}=${GRPC_CXX_FLAGS}"
-DCMAKE_PREFIX_PATH='${GRPC_PREFIX_PATH_ALT_SEP}'
-DgRPC_ABSL_PROVIDER=package
-DgRPC_BUILD_CSHARP_EXT=OFF
Expand Down