Skip to content

Commit

Permalink
Use DYN_GO_FLAGS instead of custom FLAGS for fluent-bit-plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
cosmo0920 committed Aug 19, 2019
1 parent 7621dbc commit b3e1e64
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ DYN_GO_FLAGS := -ldflags "$(GO_LDFLAGS)" -tags netgo
# Also remove the -s and -w flags present in the normal build which strip the symbol table and the DWARF symbol table.
DEBUG_GO_FLAGS := -gcflags "all=-N -l" -ldflags "-extldflags \"-static\" $(GO_LDFLAGS)" -tags netgo
DYN_DEBUG_GO_FLAGS := -gcflags "all=-N -l" -ldflags "$(GO_LDFLAGS)" -tags netgo
FLUENTBIT_GO_FLAGS := -ldflags "-X $(VPREFIX).Branch=$(GIT_BRANCH) -X $(VPREFIX).Version=$(IMAGE_TAG) -X $(VPREFIX).Revision=$(GIT_REVISION)"

NETGO_CHECK = @strings $@ | grep cgo_stub\\\.go >/dev/null || { \
rm $@; \
Expand Down Expand Up @@ -357,7 +356,7 @@ docker-driver-clean:
# fluent-bit plugin #
#####################
fluent-bit-plugin:
go build $(FLUENTBIT_GO_FLAGS) -buildmode=c-shared -o fluent-bit/fluent-bit-go-loki/out_loki.so ./fluent-bit/fluent-bit-go-loki
go build $(DYN_GO_FLAGS) -buildmode=c-shared -o fluent-bit/fluent-bit-go-loki/out_loki.so ./fluent-bit/fluent-bit-go-loki

########################
# Bigtable Backup Tool #
Expand Down

0 comments on commit b3e1e64

Please sign in to comment.