Skip to content

Commit

Permalink
build: make all of the logictest binaries depend on OPTGEN_TARGETS
Browse files Browse the repository at this point in the history
Fingers crossed this fixes the spurious failures for `make
testlogic`. The theory of that failure is that `bin/logictest` did not
have a dependency on `OPTGEN_TARGETS`. When `make testlogic` is run, the
testlogic rule is expanded to
`bin/logictest{,opt,ccl}`. `OPTGEN_TARGETS` could this be built in
parallel with `bin/logictest` being built.

Release note: None
  • Loading branch information
petermattis authored and danhhz committed Jan 10, 2020
1 parent 617cb39 commit 5853366
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 @@ -1641,8 +1641,7 @@ logictest-bins := bin/logictest bin/logictestopt bin/logictestccl
# TODO(benesch): Derive this automatically. This is getting out of hand.
bin/workload bin/docgen bin/execgen bin/roachtest $(logictest-bins): $(SQLPARSER_TARGETS) $(PROTOBUF_TARGETS)
bin/workload bin/roachtest $(logictest-bins): $(EXECGEN_TARGETS)
bin/roachtest $(logictest-bins): $(C_LIBS_CCL) $(CGO_FLAGS_FILES)
bin/roachtest bin/logictestopt: $(OPTGEN_TARGETS)
bin/roachtest $(logictest-bins): $(C_LIBS_CCL) $(CGO_FLAGS_FILES) $(OPTGEN_TARGETS)

$(bins): bin/%: bin/%.d | bin/prereqs bin/.submodules-initialized
@echo go install -v $*
Expand Down

0 comments on commit 5853366

Please sign in to comment.