Skip to content

Commit

Permalink
Remove git-vars from conmon/config.h generation
Browse files Browse the repository at this point in the history
The `git-vars` target force a rebuild of the `config.h` even if it
already exist. This can break build-setups, so we remove it from the
`config.h` generation.

Cherry-picked: aea87f4
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
  • Loading branch information
saschagrunert committed Jul 10, 2019
1 parent 292224c commit 481b17c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Makefile
Expand Up @@ -136,7 +136,7 @@ crio.conf: bin/crio
release-note: ${RELEASE_TOOL}
${RELEASE_TOOL} -n $(release)

conmon/config.h: git-vars cmd/crio-config/config.go oci/oci.go
conmon/config.h: cmd/crio-config/config.go oci/oci.go
$(GO) build $(LDFLAGS) -tags "$(BUILDTAGS)" -o bin/crio-config $(PROJECT)/cmd/crio-config
( cd conmon && $(CURDIR)/bin/crio-config )

Expand Down

0 comments on commit 481b17c

Please sign in to comment.