global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-02-07 00:05:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #39 from git-for-windows/fix-msys1-build

Browse Source 
mingw: Define git-wrapper variables in the scope of the build targets
This commit is contained in:
dscho
2015-03-18 20:11:04 +01:00
parent 5fb2a138bd 5942abf369
commit b578abdabc
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config.mak.uname
View File

@@ -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