Skip to content

quic: attempting to fix non-linux QUIC builds #18027

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
mattklein123 merged 7 commits into from
Sep 10, 2021
Merged

quic: attempting to fix non-linux QUIC builds #18027

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7a0b917
quic: attempting to fix non-linux QUIC builds
alyssawilk Sep 8, 2021
7cbd7ba
Merge branch 'main' into quic_build
alyssawilk Sep 8, 2021
a8fdbdd
take two
alyssawilk Sep 9, 2021
9f8e0b5
spelling
alyssawilk Sep 9, 2021
e46c320
hopefully adding windows clarity
alyssawilk Sep 9, 2021
68c1a12
windows fix
alyssawilk Sep 9, 2021
0824b90
take 3
alyssawilk Sep 9, 2021
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
6 changes: 4 additions & 2 deletions source/common/quic/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,8 +459,10 @@ envoy_cc_library(
"//source/common/network:io_socket_error_lib",
"//source/common/protobuf:utility_lib",
"//source/common/runtime:runtime_lib",
"@com_github_google_quiche//:quic_core_batch_writer_gso_batch_writer_lib",
],
] + select({
"//bazel:linux": ["@com_github_google_quiche//:quic_core_batch_writer_gso_batch_writer_lib"],
"//conditions:default": [],
}),
)

envoy_cc_library(
Expand Down
3 changes: 3 additions & 0 deletions source/common/quic/udp_gso_batch_writer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,11 @@
#pragma GCC diagnostic ignored "-Wsuggest-override"
#endif

#if defined(__linux__)

@danzh2010 danzh2010 Sep 8, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Does this fix the build? There are other places in this file refers to quic classes.
Why not excluding this header file completely in the BUILD if the platform is not Linux?

@alyssawilk alyssawilk Sep 8, 2021

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

right, sorry, I had commented out most of the file in a prior build which got lost.

So I can add that back, moving the endif to the bottom of the file, or we could have one file for setting UDP_GSO_BATCH_WRITER_COMPILETIME_SUPPORT and a second file for use of it.

which would you prefer?

@danzh2010 danzh2010 Sep 8, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I'm okay either way, maybe the latter is easier to understand?

#include "quiche/quic/core/batch_writer/quic_gso_batch_writer.h"

#endif

#ifdef __clang__
#pragma clang diagnostic pop
#endif
Expand Down