Skip to content
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.

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

Makefile: Only set PROMTAIL_CGO if CGO_ENABLED is not 0. #3935

Merged
merged 2 commits into from
Jul 5, 2021

Conversation

ecraven
Copy link
Contributor

@ecraven ecraven commented Jul 2, 2021

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

This allows to build promtail without journald support on linux distributions that don't have systemd.

Run as
CGO_ENABLED=0 make promtail
@CLAassistant
Copy link

CLAassistant commented Jul 2, 2021

CLA assistant check
All committers have signed the CLA.

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)
Copy link
Contributor

Choose a reason for hiding this comment

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

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?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

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.

Copy link
Contributor

@kavirajk kavirajk left a comment

Choose a reason for hiding this comment

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

Thanks @ecraven. LGTM 🎉

@cyriltovena cyriltovena merged commit 1fb06cc into grafana:main Jul 5, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Support building promtail without systemd/journald support (disabling cgo)
4 participants