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.

Sign up for GitHub

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
Merged

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

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
500af36
Only set PROMTAIL_CGO if CGO_ENABLED is not 0.
ecraven Jul 2, 2021
453b10b
Fix scope.
ecraven Jul 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

ifeq ($(shell go env GOHOSTOS),linux)
ifeq ($(shell go env GOOS),linux)
PROMTAIL_CGO = 1
PROMTAIL_GO_FLAGS = $(DYN_GO_FLAGS)
PROMTAIL_DEBUG_GO_FLAGS = $(DYN_DEBUG_GO_FLAGS)
endif
endif
endif

promtail: yacc ragel clients/cmd/promtail/promtail
promtail-debug: yacc ragel clients/cmd/promtail/promtail-debug
Expand Down