git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-04-21 15:30:15 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

fixup! mingw: allow git.exe to be used instead of the "Git wrapper"

Browse Source 
Let's not forget Windows/ARM64 support.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2025-04-15 18:24:48 +02:00
parent 4a5bd37537
commit dcbf85a8e2
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
compat/mingw.c
View File

@@ -3613,6 +3613,10 @@ static size_t append_system_bin_dirs(char *path, size_t size)
strip_suffix_mem(prefix, &len, "\\mingw64\\bin"))
off += xsnprintf(path + off, size - off,
"%.*s\\mingw64\\bin;", (int)len, prefix);
else if (strip_suffix_mem(prefix, &len, "\\clangarm64\\libexec\\git-core") ||
strip_suffix_mem(prefix, &len, "\\clangarm64\\bin"))
off += xsnprintf(path + off, size - off,
"%.*s\\clangarm64\\bin;", (int)len, prefix);
else if (strip_suffix_mem(prefix, &len, "\\mingw32\\libexec\\git-core") ||
strip_suffix_mem(prefix, &len, "\\mingw32\\bin"))
off += xsnprintf(path + off, size - off,
@@ -3718,9 +3722,7 @@ static void setup_windows_environment(void)
char buf[32768];
size_t off = 0;
xsnprintf(buf, sizeof(buf),
"MINGW%d", (int)(sizeof(void *) * 8));
setenv("MSYSTEM", buf, 1);
setenv("MSYSTEM", ENSURE_MSYSTEM_IS_SET, 1);
if (home)
off += xsnprintf(buf + off, sizeof(buf) - off,

4
config.mak.uname
View File

@@ -506,7 +506,7 @@ endif
compat/win32/pthread.o compat/win32/syslog.o \
compat/win32/trace2_win32_process_info.o \
compat/win32/dirent.o compat/win32/fscache.o compat/win32/wsl.o
COMPAT_CFLAGS = -D__USE_MINGW_ACCESS -DDETECT_MSYS_TTY -DENSURE_MSYSTEM_IS_SET -DNOGDI -DHAVE_STRING_H -Icompat -Icompat/regex -Icompat/win32 -DSTRIP_EXTENSION=\".exe\"
COMPAT_CFLAGS = -D__USE_MINGW_ACCESS -DDETECT_MSYS_TTY -DENSURE_MSYSTEM_IS_SET="\"$(MSYSTEM)\"" -DNOGDI -DHAVE_STRING_H -Icompat -Icompat/regex -Icompat/win32 -DSTRIP_EXTENSION=\".exe\"
BASIC_LDFLAGS = -IGNORE:4217 -IGNORE:4049 -NOLOGO
# invalidcontinue.obj allows Git's source code to close the same file
# handle twice, or to access the osfhandle of an already-closed stdout
@@ -743,7 +743,7 @@ ifeq ($(uname_S),MINGW)
endif
CC = gcc
COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO=0 -DDETECT_MSYS_TTY \
-DENSURE_MSYSTEM_IS_SET -fstack-protector-strong
-DENSURE_MSYSTEM_IS_SET="\"$(MSYSTEM)\"" -fstack-protector-strong
EXTLIBS += -lntdll
EXTRA_PROGRAMS += headless-git$X
INSTALL = /bin/install