Skip to content

Commit 6b9f250

Browse files
domMayhewKtorZ
authored andcommittedJun 11, 2024··
Fix bugs in Makefile
Clean whole build directory so cabal actually rebuilds the binary, and include the postgres flag in configure stage
1 parent c47801d commit 6b9f250

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed
 

‎Makefile

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
OUT := dist
22

33
GHC := 9.6.3
4-
STYLISH_HASKELL_VERSION := 0.14.5.0
4+
STYLISH_HASKELL_VERSION := 0.13.0.0
55

66
# Default network for snapshots.
77
NETWORK := preview
@@ -15,7 +15,8 @@ VERSION := $(shell cat package.yaml| grep "version:" | sed "s/[^0-9]*\([0-9]\)\(
1515
TAG := $(shell echo $(VERSION) | sed "s/^0$$/nightly/")
1616
CONFIG := $(shell pwd)/config/network/$(NETWORK)
1717
CACHEDIR := ${HOME}/.cache/kupo/${NETWORK}
18-
BIN_DIR_PATH := dist-newstyle/build/$(ARCH)-$(OS)/ghc-$(GHC)/kupo-$(VERSION)/x/kupo/build/kupo
18+
BUILD_DIR_PATH := dist-newstyle/build/$(ARCH)-$(OS)/ghc-$(GHC)/kupo-$(VERSION)
19+
BIN_DIR_PATH := $(BUILD_DIR_PATH)/x/kupo/build/kupo
1920

2021
ifeq ($(postgres), true)
2122
PG_FLAG := -f postgres
@@ -103,7 +104,7 @@ doc: # Serve the rendered documentation on \033[0;33m<http://localhost:8000>\033
103104

104105
clean: # Remove build artifacts
105106
rm -r $(OUT) 2>/dev/null && echo "Removed $(OUT)" || \
106-
rm -r $(BIN_DIR_PATH) 2>/dev/null && echo "Removed $(BIN_DIR_PATH)" || \
107+
rm -r $(BUILD_DIR_PATH) 2>/dev/null && echo "Removed $(BUILD_DIR_PATH)" || \
107108
rm cabal.project.freeze 2>/dev/null && echo "Removed cabal.project.freeze" || true
108109
echo "Finished cleaning."
109110

0 commit comments

Comments
 (0)
Please sign in to comment.