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

plugin: fix plugin build and load with go 1.13 (#13455) #13527

Merged
merged 6 commits into from
Nov 27, 2019
Merged

plugin: fix plugin build and load with go 1.13 (#13455) #13527

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d82c196
plugin: fix plugin build and load with go 1.13 (#13455)
lysu Nov 15, 2019
9e8ebfc
Merge branch 'release-2.1' into cp21-plugin-build
zimulala Nov 21, 2019
78ea23b
Merge branch 'release-2.1' into cp21-plugin-build
bb7133 Nov 22, 2019
0592c45
Merge branch 'release-2.1' into cp21-plugin-build
lysu Nov 26, 2019
1cc412b
Merge branch 'release-2.1' into cp21-plugin-build
sre-bot Nov 26, 2019
a1d4f8d
Merge branch 'release-2.1' into cp21-plugin-build
lysu Nov 27, 2019
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
Next Next commit
plugin: fix plugin build and load with go 1.13 (#13455)
  • Loading branch information
@lysu
lysu committed Nov 18, 2019
commit d82c1961bd779c72d1b29c22731e8ab137c97cac
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ path_to_add := $(addsuffix /bin,$(subst :,/bin:,$(GOPATH)))
export PATH := $(path_to_add):$(PATH)

GO := GO111MODULE=on go
GOBUILD := CGO_ENABLED=1 $(GO) build $(BUILD_FLAG) -trimpath
GOBUILD := CGO_ENABLED=1 $(GO) build $(BUILD_FLAG)
GOTEST := CGO_ENABLED=1 $(GO) test -p 3
OVERALLS := CGO_ENABLED=1 overalls
GOVERALLS := goveralls
Expand Down
2 changes: 0 additions & 2 deletions cmd/pluginpkg/pluginpkg.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,10 +144,8 @@ func main() {
}

outputFile := filepath.Join(outDir, pluginName+"-"+version+".so")
pluginPath := `-pluginpath=` + pluginName + "-" + version
ctx := context.Background()
buildCmd := exec.CommandContext(ctx, "go", "build",
"-ldflags", pluginPath,
"-buildmode=plugin",
"-o", outputFile, pkgDir)
buildCmd.Stderr = os.Stderr
Expand Down