From 5942abf3699a6e5475f2b690e46e4d64eba870b7 Mon Sep 17 00:00:00 2001 From: Sebastian Schuberth Date: Wed, 18 Mar 2015 16:02:30 +0100 Subject: [PATCH] mingw: Define git-wrapper variables in the scope of the build targets This fixes the MSYS1-based build which otherwise would have the variables but not the build targets. Signed-off-by: Sebastian Schuberth --- config.mak.uname | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.mak.uname b/config.mak.uname index 11142947af3e37..bb55c56e073bdc 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -524,8 +524,6 @@ ifneq (,$(findstring MINGW,$(uname_S))) NATIVE_CRLF = YesPlease X = .exe SPARSE_FLAGS = -Wno-one-bit-signed-bitfield - OTHER_PROGRAMS += git-wrapper$(X) - BUILT_IN_WRAPPER = git-wrapper$(X) ifneq (,$(wildcard ../THIS_IS_MSYSGIT)) htmldir = share/doc/git/$(firstword $(subst -, ,$(GIT_VERSION)))/html prefix = @@ -563,6 +561,8 @@ else else NO_CURL = YesPlease endif + OTHER_PROGRAMS += git-wrapper$(X) + BUILT_IN_WRAPPER = git-wrapper$(X) git-wrapper$(X): compat/win32/git-wrapper.o git.res $(QUIET_LINK)$(CC) -Wall -s -o $@ $^ -lshell32 -lshlwapi