Skip to content

Commit 938ff0f

Browse files
cfergeauanjannath
authored andcommitted
Move 'clean' from 'release' to 'embed_bundle'
'embed_bundle' sets LDFLAGS and has a dependency on 'cross', so this rule is trying to force the rebuild of the misc binaries. Depending on 'clean' is thus better here.
1 parent c487238 commit 938ff0f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ fmtcheck: ## Checks for style violation using gofmt
122122
@gofmt -l $(SOURCE_DIRS) | grep ".*\.go"; if [ "$$?" = "0" ]; then exit 1; fi
123123

124124
.PHONY: release
125-
release: clean fmtcheck embed_bundle
125+
release: fmtcheck embed_bundle
126126
mkdir $(RELEASE_DIR)
127127

128128
@mkdir -p $(BUILD_DIR)/crc-$(CRC_VERSION)-darwin-amd64
@@ -146,7 +146,7 @@ check_bundledir:
146146
@$(call check_defined, BUNDLE_DIR, "Embedding bundle requires BUNDLE_DIR set to a directory containing CRC bundles for all hypervisors")
147147

148148
embed_bundle: LDFLAGS += $(BUNDLE_EMBEDDED)
149-
embed_bundle: cross binappend check_bundledir $(BUNDLES)
149+
embed_bundle: clean cross binappend check_bundledir $(BUNDLES)
150150
binappend-cli write $(BUILD_DIR)/linux-amd64/crc $(BUNDLE_DIR)/crc_libvirt_$(BUNDLE_VERSION).$(BUNDLE_EXTENSION)
151151
binappend-cli write $(BUILD_DIR)/darwin-amd64/crc $(BUNDLE_DIR)/crc_hyperkit_$(BUNDLE_VERSION).$(BUNDLE_EXTENSION)
152152
binappend-cli write $(BUILD_DIR)/windows-amd64/crc.exe $(BUNDLE_DIR)/crc_hyperv_$(BUNDLE_VERSION).$(BUNDLE_EXTENSION)

0 commit comments

Comments
 (0)