From: Johannes Sixt <j6t@kdbg.org>
To: Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH 1/1] Windows: force-recompile git.res for differing architectures
Date: Tue, 6 Nov 2018 22:44:07 +0100 [thread overview]
Message-ID: <c4e3790e-4c41-0d15-38d9-79fa288fb9b3@kdbg.org> (raw)
In-Reply-To: <87794514ef3a83f95d81f89287b81aeed5c92296.1541516148.git.gitgitgadget@gmail.com>
Am 06.11.18 um 15:55 schrieb Johannes Schindelin via GitGitGadget:
> From: Johannes Schindelin <johannes.schindelin@gmx.de>
>
> 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).
On Linux, when I recompile for a different architecture, CFLAGS would
change, so I would have thought that GIT-CFLAGS were the natural choice
for a dependency. Don't they change in this case on Windows, too?
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
> Makefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Makefile b/Makefile
> index bbfbb4292d..8375736c32 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -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-' ' '))) \
>
next prev parent reply other threads:[~2018-11-06 21:44 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-06 14:55 [PATCH 0/1] Windows: force-recompile git.res for differing architectures Johannes Schindelin via GitGitGadget
2018-11-06 14:55 ` [PATCH 1/1] " Johannes Schindelin via GitGitGadget
2018-11-06 21:44 ` Johannes Sixt [this message]
2018-11-07 1:32 ` Junio C Hamano
2018-11-07 6:55 ` Johannes Sixt
2018-11-07 9:03 ` Junio C Hamano
2018-11-07 11:25 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c4e3790e-4c41-0d15-38d9-79fa288fb9b3@kdbg.org \
--to=j6t@kdbg.org \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).