Skip to content

Commit 4adb242

Browse files
committed
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 <[email protected]>
1 parent 8e351e7 commit 4adb242

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1804,7 +1804,7 @@ $(SCRIPT_LIB) : % : %.sh GIT-SCRIPT-DEFINES
18041804
$(QUIET_GEN)$(cmd_munge_script) && \
18051805
mv $@+ $@
18061806

1807-
git.res: git.rc GIT-VERSION-FILE
1807+
git.res: git.rc GIT-VERSION-FILE GIT-PREFIX
18081808
$(QUIET_RC)$(RC) \
18091809
$(join -DMAJOR= -DMINOR=, $(wordlist 1,2,$(subst -, ,$(subst ., ,$(GIT_VERSION))))) \
18101810
-DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" $< -o $@

0 commit comments

Comments
 (0)