aboutsummaryrefslogtreecommitdiffstats
path: root/config.mak.uname
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-01-14 15:29:32 -0800
committerJunio C Hamano <gitster@pobox.com>2019-01-14 15:29:32 -0800
commit25d90d1cb72ce51407324259516843406142fe89 (patch)
tree459b0885da10de9eddeed12f49cc9ebd10f0fac8 /config.mak.uname
parentd95f610c64b9b33957beaa1da60a489d0b4aa7fc (diff)
parent1cadad6f658bfb3ab54b25dd04bac372253473b6 (diff)
downloadgit-25d90d1cb72ce51407324259516843406142fe89.tar.gz
Merge branch 'tb/use-common-win32-pathfuncs-on-cygwin'
Cygwin update. * tb/use-common-win32-pathfuncs-on-cygwin: git clone <url> C:\cygwin\home\USER\repo' is working (again)
Diffstat (limited to 'config.mak.uname')
-rw-r--r--config.mak.uname3
1 files changed, 2 insertions, 1 deletions
diff --git a/config.mak.uname b/config.mak.uname
index 378ca0a582..e391431041 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -187,7 +187,7 @@ ifeq ($(uname_O),Cygwin)
UNRELIABLE_FSTAT = UnfortunatelyYes
OBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo
MMAP_PREVENTS_DELETE = UnfortunatelyYes
- COMPAT_OBJS += compat/cygwin.o
+ COMPAT_OBJS += compat/win32/path-utils.o
FREAD_READS_DIRECTORIES = UnfortunatelyYes
endif
ifeq ($(uname_S),FreeBSD)
@@ -528,6 +528,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))
COMPAT_CFLAGS += -DNOGDI -Icompat -Icompat/win32
COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\"
COMPAT_OBJS += compat/mingw.o compat/winansi.o \
+ compat/win32/path-utils.o \
compat/win32/pthread.o compat/win32/syslog.o \
compat/win32/dirent.o
BASIC_CFLAGS += -DWIN32 -DPROTECT_NTFS_DEFAULT=1