Makefile: Only set PROMTAIL_CGO if CGO_ENABLED is not 0. #3935
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 allows to build promtail without journald support on linux distributions that don't have systemd. Run as CGO_ENABLED=0 make promtail
|
|
kavirajk
reviewed
Jul 2, 2021
Makefile
Outdated
| @@ -202,13 +202,15 @@ PROMTAIL_GO_FLAGS := $(GO_FLAGS) | |||
| PROMTAIL_DEBUG_GO_FLAGS := $(DEBUG_GO_FLAGS) | |||
|
|
|||
| # Validate GOHOSTOS=linux && GOOS=linux to use CGO. | |||
| ifneq ($(CGO_ENABLED), 0) | |||
There was a problem hiding this comment.
Thanks for the PR :)
I like it is being controlled by CGO_ENABLED. But explained my concern here. #3933 (comment)
why not just PROMTAIL_CGO = $(CGO_ENABLED) or something similar?
There was a problem hiding this comment.
I've reworked the MR to only affect PROMTAIL_CGO. In my previous tests, it didn't work if I only modified that, but that seems to have been a problem with that specific test, it now works fine.
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 allows to build promtail without journald support on linux distributions that don't have systemd.
Run as
CGO_ENABLED=0 make promtail
Fixes #3933