github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Fix $(PWD) issue for Windows makefile

Browse Source 
Seems $(PWD) if the shell is powershell may not be inherited properly
as it ends up being an empty string. The result of this is that using
mingw's make with powershell is that $(PWD)/bin ends up being /bin and the
windows shim will get placed there. make install afterwards will try to find
the shim at $pwd/bin and fail.

Changing to CURDIR https://www.gnu.org/software/make/manual/make.html#index-CURDIR
seems to be a solution here as it's not inherited by the environment and
is set by make itself so should work across any type of shell.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
This commit is contained in:
Daniel Canter
2021-12-21 07:39:04 -05:00
parent 653f2f1ce4
commit 8e6afaa207
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.windows
View File

@@ -26,7 +26,7 @@ WINDOWS_SHIM=bin/containerd-shim-runhcs-v1.exe
BINARIES := $(addsuffix .exe,$(BINARIES)) $(WINDOWS_SHIM) BINARIES := $(addsuffix .exe,$(BINARIES)) $(WINDOWS_SHIM)
$(WINDOWS_SHIM): script/setup/install-runhcs-shim go.mod $(WINDOWS_SHIM): script/setup/install-runhcs-shim go.mod
DESTDIR=$(PWD)/bin $< DESTDIR=$(CURDIR)/bin $<
bin/%.exe: cmd/% FORCE bin/%.exe: cmd/% FORCE
$(BUILD_BINARY) $(BUILD_BINARY)