build: simplify cc_configure and static link for libc++ by lizan · Pull Request #7329 · envoyproxy/envoy

lizan · 2019-06-19T21:48:09Z

Signed-off-by: Lizan Zhou lizan@tetrate.io

Description:
Take a similar approach of bazelbuild/bazel@ab9c1f5, which use -l:libstdc++.a to statically link libstdc++. This makes us closer to remove our own cc_wrapper and cc_configure in the future. Also it will allow us do static link with libc++.

Risk Level: Med
Testing: local, CI
Docs Changes:
Release Notes:

Signed-off-by: Lizan Zhou <lizan@tetrate.io>

mattklein123 · 2019-06-20T03:04:36Z

cc @keith @jmillikin-stripe

jmillikin-stripe · 2019-06-20T03:40:25Z

bazel/cc_configure.bzl

        "USE_CLANG_CL",
        "CC",
        "CFLAGS",
-        "CXX",


When building with GCC, does the final link happen with gcc or g++?

Signed-off-by: Lizan Zhou <lizan@tetrate.io>

lizan · 2019-06-20T23:52:14Z

@jmillikin-stripe @PiotrSikora this is ready now and passes all test, PTAL.

bazel/cc_configure.bzl

bazel/cc_wrapper.py

PiotrSikora · 2019-06-22T00:13:49Z

bazel/foreign_cc/BUILD

        "ENABLE_LIB_ONLY": "on",
        "CMAKE_BUILD_TYPE": "RelWithDebInfo",
        "CMAKE_INSTALL_LIBDIR": "lib",
+        "CMAKE_CXX_COMPILER_FORCED": "on",


Shouldn't we set CMAKE_C_COMPILER_FORCED set as well?

I didn't add it because it wasn't needed, but fine to add as well. no strong opinion on this.

.bazelrc

test/exe/envoy_static_test.sh

htuch

Looks good, can you verify this doesn't break oss-fuzz? This is a kind of scary change that is worth verifying. Instructions to test are at https://github.com/envoyproxy/envoy/tree/master/test/fuzz#running-fuzz-tests-locally. CC @asraa for fuzz build visibility.

stale · 2019-07-01T21:52:28Z

This pull request has been automatically marked as stale because it has not had activity in the last 7 days. It will be closed in 7 days if no further activity occurs. Please feel free to give a status update now, ping for review, or re-open when it's ready. Thank you for your contributions!

stale · 2019-07-08T22:14:09Z

This pull request has been automatically closed because it has not had activity in the last 14 days. Please feel free to give a status update now, ping for review, or re-open when it's ready. Thank you for your contributions!

lizan · 2019-07-08T22:41:12Z

back from vacation, will check fuzz locally.

Signed-off-by: Lizan Zhou <lizan@tetrate.io>

lizan · 2019-07-10T19:39:38Z

@htuch should be good along with google/oss-fuzz#2586

htuch

Thanks!

lizan · 2019-07-10T23:00:15Z

@htuch google/oss-fuzz#2586 is merged, but let's hold merging this until 1.11.0.

htuch · 2019-07-10T23:49:05Z

@lizan I thought this would happen at the same time as the oss-fuzz merge, I think that PR will break Envoy build without this one. CC @asraa

lizan · 2019-07-11T00:08:51Z

@htuch I'm fine either way, let me see if that PR break fuzz with current master.

lizan · 2019-07-11T00:38:30Z

@htuch ah yeah the oss-fuzz breaks, I'm fine merge this, up to you.

Description: Cherry-picking latest commit of #7329 before release. To unbreak fuzz build. Address #7507 that bring real c++fs dependency. Risk Level: Low Testing: local fuzz, CI Docs Changes: Release Notes: Signed-off-by: Lizan Zhou <lizan@tetrate.io>

build: simplify cc_configure

56d5bd0

Signed-off-by: Lizan Zhou <lizan@tetrate.io>

lizan requested review from PiotrSikora and htuch June 19, 2019 21:48

lizan assigned htuch Jun 19, 2019

lizan changed the title ~~build: simplify cc_configure~~ WIP: build: simplify cc_configure Jun 19, 2019

fix

76bbfa9

Signed-off-by: Lizan Zhou <lizan@tetrate.io>

jmillikin-stripe reviewed Jun 20, 2019

View reviewed changes

lizan added 4 commits June 20, 2019 04:51

fix asan and more

f4c1fc2

Signed-off-by: Lizan Zhou <lizan@tetrate.io>

fix

9f0eec5

Signed-off-by: Lizan Zhou <lizan@tetrate.io>

tsan fix

900b808

Signed-off-by: Lizan Zhou <lizan@tetrate.io>

retrofit bazel 0.26

dae720b

Signed-off-by: Lizan Zhou <lizan@tetrate.io>

lizan changed the title ~~WIP: build: simplify cc_configure~~ build: simplify cc_configure and static link for libc++ Jun 20, 2019

PiotrSikora reviewed Jun 22, 2019

View reviewed changes

PiotrSikora previously approved these changes Jun 22, 2019

View reviewed changes

htuch reviewed Jun 24, 2019

View reviewed changes

htuch added the waiting:any label Jun 24, 2019

stale bot added the stale stalebot believes this issue/PR has not been touched recently label Jul 1, 2019

stale bot closed this Jul 8, 2019

lizan reopened this Jul 8, 2019

stale bot removed the stale stalebot believes this issue/PR has not been touched recently label Jul 8, 2019

repokitteh-read-only bot removed the waiting:any label Jul 8, 2019

htuch added the waiting:any label Jul 9, 2019

lizan added 2 commits July 10, 2019 08:27

Merge remote-tracking branch 'origin/master' into HEAD

e19c3f6

c++fs doesn't have to be explicitly in linkopts

30a0b42

Signed-off-by: Lizan Zhou <lizan@tetrate.io>

lizan dismissed PiotrSikora’s stale review via 30a0b42 July 10, 2019 19:39

repokitteh-read-only bot removed the waiting:any label Jul 10, 2019

PiotrSikora approved these changes Jul 10, 2019

View reviewed changes

htuch approved these changes Jul 10, 2019

View reviewed changes

lizan mentioned this pull request Jul 11, 2019

build: remove -lc++fs from linkopts #7534

Merged

Merge remote-tracking branch 'upstream/master' into static_link_revisit

fac1815

Merge remote-tracking branch 'upstream/master' into static_link_revisit

2675933

lizan merged commit 00a6251 into envoyproxy:master Jul 11, 2019

lizan deleted the static_link_revisit branch July 11, 2019 19:45

moderation mentioned this pull request Jul 11, 2019

bazel: adapt cc_wraper.py to python3 #7519

Merged

lizan mentioned this pull request Jul 17, 2019

build: remove cc_configure and cc_wrapper #7555

Merged

Conversation

lizan commented Jun 19, 2019

Uh oh!

mattklein123 commented Jun 20, 2019

Uh oh!

jmillikin-stripe Jun 20, 2019

Choose a reason for hiding this comment

Uh oh!

lizan Jun 20, 2019

Choose a reason for hiding this comment

Uh oh!

lizan commented Jun 20, 2019

Uh oh!

Uh oh!

Uh oh!

PiotrSikora Jun 22, 2019

Choose a reason for hiding this comment

Uh oh!

lizan Jun 22, 2019

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

htuch left a comment

Choose a reason for hiding this comment

Uh oh!

stale bot commented Jul 1, 2019

Uh oh!

stale bot commented Jul 8, 2019

Uh oh!

lizan commented Jul 8, 2019

Uh oh!

lizan commented Jul 10, 2019

Uh oh!

htuch left a comment

Choose a reason for hiding this comment

Uh oh!

lizan commented Jul 10, 2019

Uh oh!

htuch commented Jul 10, 2019

Uh oh!

lizan commented Jul 11, 2019

Uh oh!

lizan commented Jul 11, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants