From cfafd434e80cf906b38f13fdc89cd9634abba717 Mon Sep 17 00:00:00 2001 From: Paulo Janotti Date: Fri, 26 Sep 2025 16:18:17 -0700 Subject: [PATCH] Revert "[chore] Fix `make generate` on Windows (#42918)" This reverts commit 3651cff09653d78f72d31380afac73728712d26c. --- Makefile.Common | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/Makefile.Common b/Makefile.Common index c31c578a0b89a..a5b814706e1ba 100644 --- a/Makefile.Common +++ b/Makefile.Common @@ -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)) @@ -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