[release/1.6] Make building static binaries simpler #7045
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit adds STATIC makefile variable to adjust LDFLAGS and build tags accordingly. Fixes containerd#5824. Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com> (cherry picked from commit 00eb74a) Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
|
Skipping CI for Draft Pull Request. |
fuweid
reviewed
Jun 10, 2022
| @@ -21,7 +21,9 @@ COMMANDS += containerd-shim containerd-shim-runc-v1 containerd-shim-runc-v2 | |||
| # check GOOS for cross compile builds | |||
| ifeq ($(GOOS),linux) | |||
| ifneq ($(GOARCH),$(filter $(GOARCH),mips mipsle mips64 mips64le ppc64)) | |||
| GO_GCFLAGS += -buildmode=pie | |||
| ifeq ($(STATIC),) | |||
| GO_GCFLAGS += -buildmode=pie | |||
There was a problem hiding this comment.
is it changing the original behavior?
There was a problem hiding this comment.
No. By default (without STATIC=1), containerd is building position-independent, dynamically-liked binaries.
dmcgowan
approved these changes
Jun 10, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit adds STATIC makefile variable to adjust LDFLAGS and build
tags accordingly.
Fixes #5824.
Signed-off-by: Kazuyoshi Kato katokazu@amazon.com
(cherry picked from commit 00eb74a)
Signed-off-by: Kazuyoshi Kato katokazu@amazon.com