# [PATCH 2/4] Makefile: merge two Cygwin configuration sections into one

3 messages from 2009-10-27 to 2009-11-03. Participants: Ramsay Jones, Johannes Sixt, Junio C Hamano.
Thread: https://gitlist.dev/t/21387

## Ramsay Jones, 2009-10-27 19:11

Subject: [PATCH 2/4] Makefile: merge two Cygwin configuration sections into one
Message-ID: <4AE745FB.1060902@ramsay1.demon.co.uk>
URL: https://gitlist.dev/e/4AE745FB.1060902%40ramsay1.demon.co.uk

```

Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
---

I can't think of any potential problems with this... but I've
added Dmitry to the cc-list, since he appears to have added
the second cygwin section in adbc0b6b, just in case... ;-)

ATB,
Ramsay Jones

 Makefile |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index fea237b..8e1cfc5 100644
--- a/Makefile
+++ b/Makefile
@@ -782,6 +782,8 @@ ifeq ($(uname_O),Cygwin)
 	NO_MMAP = YesPlease
 	NO_IPV6 = YesPlease
 	X = .exe
+	COMPAT_OBJS += compat/cygwin.o
+	UNRELIABLE_FSTAT = UnfortunatelyYes
 endif
 ifeq ($(uname_S),FreeBSD)
 	NEEDS_LIBICONV = YesPlease
@@ -891,10 +893,6 @@ ifeq ($(uname_S),HP-UX)
 	NO_SYS_SELECT_H = YesPlease
 	SNPRINTF_RETURNS_BOGUS = YesPlease
 endif
-ifneq (,$(findstring CYGWIN,$(uname_S)))
-	COMPAT_OBJS += compat/cygwin.o
-	UNRELIABLE_FSTAT = UnfortunatelyYes
-endif
 ifdef MSVC
 	GIT_VERSION := $(GIT_VERSION).MSVC
 	pathsep = ;
-- 
1.6.5

```

## Johannes Sixt, 2009-11-03 07:22

Subject: Re: [PATCH 2/4] Makefile: merge two Cygwin configuration sections into one
Message-ID: <4AEFDA3F.2070405@viscovery.net>
URL: https://gitlist.dev/e/4AEFDA3F.2070405%40viscovery.net
In-Reply-To: <4AE745FB.1060902@ramsay1.demon.co.uk>

```
Ramsay Jones schrieb:
> diff --git a/Makefile b/Makefile
> index fea237b..8e1cfc5 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -782,6 +782,8 @@ ifeq ($(uname_O),Cygwin)
>  	NO_MMAP = YesPlease
>  	NO_IPV6 = YesPlease
>  	X = .exe
> +	COMPAT_OBJS += compat/cygwin.o
> +	UNRELIABLE_FSTAT = UnfortunatelyYes
>  endif
>  ifeq ($(uname_S),FreeBSD)
>  	NEEDS_LIBICONV = YesPlease
> @@ -891,10 +893,6 @@ ifeq ($(uname_S),HP-UX)
>  	NO_SYS_SELECT_H = YesPlease
>  	SNPRINTF_RETURNS_BOGUS = YesPlease
>  endif
> -ifneq (,$(findstring CYGWIN,$(uname_S)))
> -	COMPAT_OBJS += compat/cygwin.o
> -	UNRELIABLE_FSTAT = UnfortunatelyYes
> -endif
>  ifdef MSVC
>  	GIT_VERSION := $(GIT_VERSION).MSVC
>  	pathsep = ;

I think this an obviously good change even outside this series.

-- Hannes

```

## Junio C Hamano, 2009-11-03 07:46

Subject: Re: [PATCH 2/4] Makefile: merge two Cygwin configuration sections into one
Message-ID: <7vk4y8t5ij.fsf@alter.siamese.dyndns.org>
URL: https://gitlist.dev/e/7vk4y8t5ij.fsf%40alter.siamese.dyndns.org
In-Reply-To: <4AEFDA3F.2070405@viscovery.net>

```
Johannes Sixt <j.sixt@viscovery.net> writes:

> Ramsay Jones schrieb:
>> diff --git a/Makefile b/Makefile
>> index fea237b..8e1cfc5 100644
>> --- a/Makefile
>> +++ b/Makefile
>> @@ -782,6 +782,8 @@ ifeq ($(uname_O),Cygwin)
>>  	NO_MMAP = YesPlease
>>  	NO_IPV6 = YesPlease
>>  	X = .exe
>> +	COMPAT_OBJS += compat/cygwin.o
>> +	UNRELIABLE_FSTAT = UnfortunatelyYes
>>  endif
>>  ifeq ($(uname_S),FreeBSD)
>>  	NEEDS_LIBICONV = YesPlease
>> @@ -891,10 +893,6 @@ ifeq ($(uname_S),HP-UX)
>>  	NO_SYS_SELECT_H = YesPlease
>>  	SNPRINTF_RETURNS_BOGUS = YesPlease
>>  endif
>> -ifneq (,$(findstring CYGWIN,$(uname_S)))
>> -	COMPAT_OBJS += compat/cygwin.o
>> -	UNRELIABLE_FSTAT = UnfortunatelyYes
>> -endif
>>  ifdef MSVC
>>  	GIT_VERSION := $(GIT_VERSION).MSVC
>>  	pathsep = ;
>
> I think this an obviously good change even outside this series.

Thanks; I think this one makes sense.

```
