Skip to content

mingw: Define git-wrapper variables in the scope of the build targets #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 18, 2015
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions config.mak.uname
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down Expand Up @@ -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
Expand Down