From 755857096049d403954b1bdef4b5b0f26e5c107b Mon Sep 17 00:00:00 2001 From: Paulo Janotti Date: Fri, 20 Sep 2024 16:49:19 -0700 Subject: [PATCH] [chore] Build .exe files by default on Windows --- Makefile | 12 ++++++++++-- Makefile.Common | 3 +++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5297ceab2c..cb361c1a6c 100644 --- a/Makefile +++ b/Makefile @@ -136,13 +136,21 @@ generate-metrics: otelcol: go generate ./... GO111MODULE=on CGO_ENABLED=0 go build -trimpath -o ./bin/otelcol_$(GOOS)_$(GOARCH)$(EXTENSION) $(BUILD_INFO) ./cmd/otelcol - ln -sf otelcol_$(GOOS)_$(GOARCH)$(EXTENSION) ./bin/otelcol +ifeq ($(OS), Windows_NT) + $(LINK_CMD) .\bin\otelcol$(EXTENSION) .\bin\otelcol_$(GOOS)_$(GOARCH)$(EXTENSION) +else + $(LINK_CMD) otelcol_$(GOOS)_$(GOARCH)$(EXTENSION) ./bin/otelcol$(EXTENSION) +endif .PHONY: migratecheckpoint migratecheckpoint: go generate ./... GO111MODULE=on CGO_ENABLED=0 go build -trimpath -o ./bin/migratecheckpoint_$(GOOS)_$(GOARCH)$(EXTENSION) $(BUILD_INFO) ./cmd/migratecheckpoint - ln -sf migratecheckpoint_$(GOOS)_$(GOARCH)$(EXTENSION) ./bin/migratecheckpoint +ifeq ($(OS), Windows_NT) + $(LINK_CMD) .\bin\migratecheckpoint$(EXTENSION) .\bin\migratecheckpoint_$(GOOS)_$(GOARCH)$(EXTENSION) +else + $(LINK_CMD) migratecheckpoint_$(GOOS)_$(GOARCH)$(EXTENSION) ./bin/migratecheckpoint$(EXTENSION) +endif .PHONY: bundle.d bundle.d: diff --git a/Makefile.Common b/Makefile.Common index fe006b5229..d51cb3d24b 100644 --- a/Makefile.Common +++ b/Makefile.Common @@ -12,9 +12,12 @@ ifeq ($(UNIX_SHELL_ON_WINDOWS),true) # The backslash needs to be doubled so its passed correctly to the shell. NORMALIZE_DIRS = sed -e 's/^/\\//' -e 's/://' -e 's/\\\\/\\//g' | sort NUM_CORES := ${NUMBER_OF_PROCESSORS} + EXTENSION ?=.exe + LINK_CMD = cmd /c mklink /H else NORMALIZE_DIRS = sort NUM_CORES := $(shell getconf _NPROCESSORS_ONLN) + LINK_CMD = ln -sf endif # SRC_ROOT is the top of the source tree.