Skip to content

Commit b578abd

Browse files
committed
Merge pull request #39 from git-for-windows/fix-msys1-build
mingw: Define git-wrapper variables in the scope of the build targets
2 parents 5fb2a13 + 5942abf commit b578abd

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

config.mak.uname

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -524,8 +524,6 @@ ifneq (,$(findstring MINGW,$(uname_S)))
524524
NATIVE_CRLF = YesPlease
525525
X = .exe
526526
SPARSE_FLAGS = -Wno-one-bit-signed-bitfield
527-
OTHER_PROGRAMS += git-wrapper$(X)
528-
BUILT_IN_WRAPPER = git-wrapper$(X)
529527
ifneq (,$(wildcard ../THIS_IS_MSYSGIT))
530528
htmldir = share/doc/git/$(firstword $(subst -, ,$(GIT_VERSION)))/html
531529
prefix =
@@ -563,6 +561,8 @@ else
563561
else
564562
NO_CURL = YesPlease
565563
endif
564+
OTHER_PROGRAMS += git-wrapper$(X)
565+
BUILT_IN_WRAPPER = git-wrapper$(X)
566566

567567
git-wrapper$(X): compat/win32/git-wrapper.o git.res
568568
$(QUIET_LINK)$(CC) -Wall -s -o $@ $^ -lshell32 -lshlwapi

0 commit comments

Comments
 (0)