diff --git a/Makefile b/Makefile index 3ef923e7e3994..c70e4f5c476c4 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/cmd/pluginpkg/pluginpkg.go b/cmd/pluginpkg/pluginpkg.go index 335a8f5b93a49..50e1736cb5a51 100644 --- a/cmd/pluginpkg/pluginpkg.go +++ b/cmd/pluginpkg/pluginpkg.go @@ -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