Skip to content

Commit 04f277d

Browse files
andrinofffloatpanebot
authored andcommitted
fix: adapt makefile for rust (#1485)
## What? Adapts makefile to run with Rust ## Why? All previous commands were failing, because `built-rust` was not passed Signed-off-by: drew <me@andrinoff.com> (cherry picked from commit 0939a62)
1 parent 3a931fc commit 04f277d

1 file changed

Lines changed: 14 additions & 14 deletions

File tree

Makefile

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ build-rust:
2929
build: build-rust
3030
CGO_LDFLAGS="-L$(SPELLDICT_LIB)" go build -o $(BUILD_DIR)/$(BINARY_NAME) .
3131

32-
install:
32+
install: build-rust
3333
@echo "Building and installing $(BINARY_NAME)..."
3434
@EXISTING=$$(which $(BINARY_NAME) 2>/dev/null); \
3535
DEST=$$([ -n "$$EXISTING" ] && dirname "$$EXISTING" || echo "$(INSTALL_DIR)"); \
@@ -39,34 +39,34 @@ install:
3939
echo "Version: $$VERSION"; \
4040
echo "Commit: $$COMMIT"; \
4141
echo "Date: $$DATE"; \
42-
go build -ldflags="-X 'main.version=$$VERSION' -X 'main.commit=$$COMMIT' -X 'main.date=$$DATE'" -o $(BUILD_DIR)/$(BINARY_NAME) .; \
42+
CGO_LDFLAGS="-L$(SPELLDICT_LIB)" go build -ldflags="-X 'main.version=$$VERSION' -X 'main.commit=$$COMMIT' -X 'main.date=$$DATE'" -o $(BUILD_DIR)/$(BINARY_NAME) .; \
4343
install -m 755 $(BUILD_DIR)/$(BINARY_NAME) "$$DEST/$(BINARY_NAME)"; \
4444
echo "Installed to $$DEST/$(BINARY_NAME)"
4545

46-
build-full:
46+
build-full: build-rust
4747
@echo "Building with version information..."
4848
@VERSION=$$(git describe --tags --abbrev=0 2>/dev/null || echo "dev"); \
4949
COMMIT=$$(git rev-parse --short HEAD 2>/dev/null || echo "unknown"); \
5050
DATE=$$(date +%Y-%m-%d); \
5151
echo "Version: $$VERSION"; \
5252
echo "Commit: $$COMMIT"; \
5353
echo "Date: $$DATE"; \
54-
go build -ldflags="-X 'main.version=$$VERSION' -X 'main.commit=$$COMMIT' -X 'main.date=$$DATE'" -o $(BUILD_DIR)/$(BINARY_NAME)-full .;
54+
CGO_LDFLAGS="-L$(SPELLDICT_LIB)" go build -ldflags="-X 'main.version=$$VERSION' -X 'main.commit=$$COMMIT' -X 'main.date=$$DATE'" -o $(BUILD_DIR)/$(BINARY_NAME)-full .;
5555

56-
run:
57-
go run .
56+
run: build-rust
57+
CGO_LDFLAGS="-L$(SPELLDICT_LIB)" go run .
5858

59-
run-log:
60-
go run . --debug --logs
59+
run-log: build-rust
60+
CGO_LDFLAGS="-L$(SPELLDICT_LIB)" go run . --debug --logs
6161

62-
test:
63-
go test ./...
62+
test: build-rust
63+
CGO_LDFLAGS="-L$(SPELLDICT_LIB)" go test ./...
6464

65-
test-verbose:
66-
go test -v ./...
65+
test-verbose: build-rust
66+
CGO_LDFLAGS="-L$(SPELLDICT_LIB)" go test -v ./...
6767

68-
test-coverage:
69-
go test -coverprofile=coverage.out ./...
68+
test-coverage: build-rust
69+
CGO_LDFLAGS="-L$(SPELLDICT_LIB)" go test -coverprofile=coverage.out ./...
7070
go tool cover -html=coverage.out -o coverage.html
7171

7272
clean:

0 commit comments

Comments
 (0)