fix: the master build no longer uses -i when building the influx binary

The `-i` flag causes a problem when a cross compilation happens because
it attempts to build files in GOROOT which is located in a directory
that is not writable by the build user. This same problem exists for
when the `-tags` are changed like adding `-tags assets` in the `all`
build that runs on the master branch.

This removes `-i` because, in the latest go release, the `-i` flag
doesn't actually do anything useful since there is another build cache
that the results are placed in regardless of whether `-i` is used.

This fixes the build on master so that `make all` and `make nightly`
will function properly.
pull/10616/head
Jonathan A. Sternberg 2018-09-25 11:33:07 -05:00
parent 7851c55c2b
commit 2ee5308a27
No known key found for this signature in database
GPG Key ID: 4A0C1200CB8B9D2E
3 changed files with 4 additions and 12 deletions

View File

@ -67,7 +67,7 @@ subdirs: $(SUBDIRS)
# Define targets for commands
#
$(CMDS): $(SOURCES)
$(GO_BUILD) -i -o $@ ./cmd/$(shell basename "$@")
$(GO_BUILD) -o $@ ./cmd/$(shell basename "$@")
#
# Define targets for utilities

1
go.sum
View File

@ -124,6 +124,7 @@ github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NH
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/influxdata/flux v0.0.0-20180919192308-1335e4da35f6 h1:p2puINFb2Hy6YfMZOd+BHhPFsbWDD/5uapXF9iEJfqE=
github.com/influxdata/flux v0.0.0-20180919192308-1335e4da35f6/go.mod h1:INqOzJeMwzRrdqUu9bjMov4brs4ctB/d8Ev8XhPxHYg=
github.com/influxdata/goreleaser v0.86.2-0.20180917143456-065bab60a4e8 h1:iNJbUfDKlfp30tP8D/Xo1oT99v72eGolQ5repbQ808I=
github.com/influxdata/goreleaser v0.86.2-0.20180917143456-065bab60a4e8/go.mod h1:aVuBpDAT5VtjtUxzvBt8HOd0buzvvk7OX3H2iaviixg=
github.com/influxdata/influxdb v0.0.0-20180904211643-ab81104697f6 h1:4lXKZjCh1+rd5MIauBsJ4FcwrqZFaErnkVWyrxoJpvQ=
github.com/influxdata/influxdb v0.0.0-20180904211643-ab81104697f6/go.mod h1:qZna6X/4elxqT3yI9iZYdZrWWdeFOOprn86kgg4+IzY=

View File

@ -1,3 +1,5 @@
// Code generated by pigeon; DO NOT EDIT.
// Package promql implements a promql parser to build flux query specifications from promql.
package promql
@ -4020,7 +4022,6 @@ func newParser(filename string, b []byte, opts ...Option) *parser {
Stats: &stats,
// start rule is rule [0] unless an alternate entrypoint is specified
entrypoint: g.rules[0].name,
emptyState: make(storeDict),
}
p.setOptions(opts)
@ -4109,9 +4110,6 @@ type parser struct {
choiceNoMatch string
// recovery expression stack, keeps track of the currently available recovery expression, these are traversed in reverse
recoveryStack []map[string]interface{}
// emptyState contains an empty storeDict, which is used to optimize cloneState if global "state" store is not used.
emptyState storeDict
}
// push a variable set on the vstack.
@ -4285,13 +4283,6 @@ func (p *parser) cloneState() storeDict {
defer p.out(p.in("cloneState"))
}
if len(p.cur.state) == 0 {
if len(p.emptyState) > 0 {
p.emptyState = make(storeDict)
}
return p.emptyState
}
state := make(storeDict, len(p.cur.state))
for k, v := range p.cur.state {
if c, ok := v.(Cloner); ok {