Skip to content

[chore ]Revert "[chore] Fix make generate on Windows (#42918)" #43021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
atoulme merged 1 commit into from
Sep 27, 2025
Merged

[chore ]Revert "[chore] Fix make generate on Windows (#42918)" #43021

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions Makefile.Common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@ SHELL = /bin/bash

# SRC_ROOT is the top of the source tree.
SRC_ROOT := $(shell git rev-parse --show-toplevel)
ifeq ($(OS),Windows_NT)
# The path format of SRC_ROOT is not understood by some tools like "go generate" on Windows, normalize the PATH to avoid issues.
SRC_ROOT := $(shell cygpath -u "$(SRC_ROOT)")
# Although make with mingw64 is able to launch tools without the ".exe" extension "go generate" is not, add the extension.
TOOL_EXTENSION := .exe
endif
# SRC_PARENT_DIR is the absolute path of source tree's parent directory
SRC_PARENT_DIR := $(shell dirname $(SRC_ROOT))

Expand Down Expand Up @@ -70,10 +64,8 @@ install-tools: $(TOOLS_BIN_NAMES)
$(TOOLS_BIN_DIR):
mkdir -p $@

$(TOOLS_MOD_DIR)/go.mod:

$(TOOLS_BIN_NAMES): $(TOOLS_BIN_DIR) $(TOOLS_MOD_DIR)/go.mod
cd $(TOOLS_MOD_DIR) && GOOS="" GOARCH="" $(GOCMD) build -o $@$(TOOL_EXTENSION) -trimpath $(filter %/$(notdir $@),$(TOOLS_PKG_NAMES))
cd $(TOOLS_MOD_DIR) && GOOS="" GOARCH="" $(GOCMD) build -o $@ -trimpath $(filter %/$(notdir $@),$(TOOLS_PKG_NAMES))

ACTIONLINT := $(TOOLS_BIN_DIR)/actionlint
ADDLICENSE := $(TOOLS_BIN_DIR)/addlicense
Expand Down
Loading