global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-27 19:12:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Windows: force-recompile git.res for differing architectures

Browse Source 
When git.rc is compiled into git.res, the result is actually dependent
on the architecture. That is, you cannot simply link a 32-bit git.res
into a 64-bit git.exe.

Therefore, to allow 32-bit and 64-bit builds in the same directory, we
let git.res depend on GIT-PREFIX so that it gets recompiled when
compiling for a different architecture (this works because the exec path
changes based on the architecture: /mingw32/libexec/git-core for 32-bit
and /mingw64/libexec/git-core for 64-bit).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2015-12-09 13:56:11 +01:00
parent 4ca6f26f84
commit 9a431ae72e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -1776,7 +1776,7 @@ else
RC_VERSION_DEFS := $(join -DMAJOR= -DMINOR= -DMICRO= -DPATCHLEVEL=, $(wordlist 1,4,$(subst -, ,$(subst ., ,$(subst .windows., ,$(GIT_VERSION))))))
endif
git.res: git.rc GIT-VERSION-FILE
git.res: git.rc GIT-VERSION-FILE GIT-PREFIX
$(QUIET_RC)$(RC) $(RC_VERSION_DEFS) \
-DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" $< -o $@