diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-18 18:23:53 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-18 18:23:53 +0900 |
| commit | 39847644adb3678da91048b2ac6ebc2b3c475f3a (patch) | |
| tree | 3dd357abac07f6ccad330e55733dd9f641925a58 | |
| parent | Merge branch 'jk/unused-parameter-fixes' (diff) | |
| parent | Windows: force-recompile git.res for differing architectures (diff) | |
| download | git-39847644adb3678da91048b2ac6ebc2b3c475f3a.tar.gz git-39847644adb3678da91048b2ac6ebc2b3c475f3a.zip | |
Merge branch 'js/mingw-res-rebuild'
Windows build update.
* js/mingw-res-rebuild:
Windows: force-recompile git.res for differing architectures
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2111,7 +2111,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-' ' '))) \ |