Skip to content

build: BUILD file changes necessary for #3892#3909

Merged
htuch merged 4 commits intoenvoyproxy:masterfrom
greenhouse-org:windows-ninja-2
Jul 26, 2018
Merged

build: BUILD file changes necessary for #3892#3909
htuch merged 4 commits intoenvoyproxy:masterfrom
greenhouse-org:windows-ninja-2

Conversation

@sesmith177
Copy link
Member

@sesmith177 sesmith177 commented Jul 19, 2018

Description:
As requested in #3892, breaking the BUILD file changes out into a separate PR

Risk Level:
Low
Testing:
bazel build //source/exe:envoy-static and bazel test //test/... on Linux
Docs Changes:
None
Release Notes:
None

Splitting this into two PRs to pass CI

Signed-off-by: Sam Smith <sesmith177@gmail.com>
@sesmith177 sesmith177 changed the title BUILD file changes necessary for #3892 build: BUILD file changes necessary for #3892 Jul 19, 2018
sesmith177 and others added 3 commits July 25, 2018 09:34
Signed-off-by: Akshat Gokhale <agokhale@pivotal.io>

Signed-off-by: Sam Smith <sesmith177@gmail.com>
This was an artifact from when livevent generated event.lib on Windows
and libevent.a + libevent_pthreads.a on Linux. Since Linux now just has
libevent.a, this is no longer needed

Signed-off-by: Sam Smith <sesmith177@gmail.com>
Signed-off-by: Akshat Gokhale <agokhale@pivotal.io>
Picks up the new libevent.a that includes the symbols from the old
libevent_pthreads.a

Signed-off-by: Akshat Gokhale <agokhale@pivotal.io>

Signed-off-by: Sam Smith <sesmith177@gmail.com>
@sesmith177
Copy link
Member Author

@lizan we've bumped the build container image and updated this PR to remove the workarounds

@lizan lizan requested a review from htuch July 25, 2018 21:05
Copy link
Member

@lizan lizan left a comment

Choose a reason for hiding this comment

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

LGTM. @htuch PTAL.

Copy link
Member

@htuch htuch left a comment

Choose a reason for hiding this comment

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

Thanks!

@htuch htuch merged commit 9b64f4b into envoyproxy:master Jul 26, 2018
@sesmith177 sesmith177 deleted the windows-ninja-2 branch October 5, 2018 16:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants