Makefile: keep MSVC and Cygwin configuration separate
Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ramsay Jones committed
Nov 7, 2009 at 20:08 UTC
d691d84eedc0f02b4caebbee89149fff18e1db91
1 file changed
+8
-3
Makefile
+8
-3
@@ -212,6 +212,12 @@ uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not')
212
uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo not')
213
uname_V := $(shell sh -c 'uname -v 2>/dev/null || echo not')
214
215
+ifdef MSVC
216
+ # avoid the MingW and Cygwin configuration sections
217
+ uname_S := Windows
218
+ uname_O := Windows
219
+endif
220
+
221
# CFLAGS and LDFLAGS are for the users to override from the command line.
222
223
CFLAGS = -g -O2 -Wall
@@ -893,7 +899,7 @@ ifeq ($(uname_S),HP-UX)
899
NO_SYS_SELECT_H = YesPlease
900
SNPRINTF_RETURNS_BOGUS = YesPlease
901
endif
896
-ifdef MSVC
902
+ifeq ($(uname_S),Windows)
903
GIT_VERSION := $(GIT_VERSION).MSVC
904
pathsep = ;
905
NO_PREAD = YesPlease
@@ -945,7 +951,7 @@ else
951
BASIC_CFLAGS += -Zi -MTd
952
endif
953
X = .exe
948
-else
954
+endif
955
ifneq (,$(findstring MINGW,$(uname_S)))
956
pathsep = ;
957
NO_PREAD = YesPlease
@@ -994,7 +1000,6 @@ else
1000
NO_PTHREADS = YesPlease
1001
endif
1002
endif
997
-endif
1003
1004
-include config.mak.autogen
1005
-include config.mak