diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2018-11-06 14:55:50 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-07 02:58:24 (GMT) |
| commit | adb59def102180b0e23ac835f41cd4f6b7a0960f (patch) | |
| tree | a9b50a561ffc4de64940443b93d8008ab028540e /Makefile | |
| parent | 8858448bb49332d353febc078ce4a3abcc962efe (diff) | |
| download | git-adb59def102180b0e23ac835f41cd4f6b7a0960f.zip git-adb59def102180b0e23ac835f41cd4f6b7a0960f.tar.gz git-adb59def102180b0e23ac835f41cd4f6b7a0960f.tar.bz2 | |
Windows: force-recompile git.res for differing architectures
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2110,7 +2110,7 @@ $(SCRIPT_LIB) : % : %.sh GIT-SCRIPT-DEFINES $(QUIET_GEN)$(cmd_munge_script) && \ mv $@+ $@ -git.res: git.rc GIT-VERSION-FILE +git.res: git.rc GIT-VERSION-FILE GIT-PREFIX $(QUIET_RC)$(RC) \ $(join -DMAJOR= -DMINOR= -DMICRO= -DPATCHLEVEL=, $(wordlist 1, 4, \ $(shell echo $(GIT_VERSION) 0 0 0 0 | tr '.a-zA-Z-' ' '))) \ |