Skip to content

Commit 2050492

Browse files
alandipertxzyfer
authored andcommitted
Make Makefile compatible with GNU Make >= 3.79.1 (#2853)
1 parent 6df8cd9 commit 2050492

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

Makefile

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,21 @@ CAT ?= $(if $(filter $(OS),Windows_NT),type,cat)
2828

2929
ifneq (,$(findstring /cygdrive/,$(PATH)))
3030
UNAME := Cygwin
31-
else ifneq (,$(findstring Windows_NT,$(OS)))
31+
else
32+
ifneq (,$(findstring Windows_NT,$(OS)))
3233
UNAME := Windows
33-
else ifneq (,$(findstring mingw32,$(MAKE)))
34+
else
35+
ifneq (,$(findstring mingw32,$(MAKE)))
3436
UNAME := Windows
35-
else ifneq (,$(findstring MINGW32,$(shell uname -s)))
37+
else
38+
ifneq (,$(findstring MINGW32,$(shell uname -s)))
3639
UNAME := Windows
3740
else
3841
UNAME := $(shell uname -s)
3942
endif
43+
endif
44+
endif
45+
endif
4046

4147
ifndef LIBSASS_VERSION
4248
ifneq ($(wildcard ./.git/ ),)
@@ -153,11 +159,13 @@ ifeq (Windows,$(UNAME))
153159
CXXFLAGS += -D ADD_EXPORTS
154160
LIB_SHARED = $(SASS_LIBSASS_PATH)/lib/libsass.dll
155161
endif
156-
else ifneq (Cygwin,$(UNAME))
162+
else
163+
ifneq (Cygwin,$(UNAME))
157164
CFLAGS += -fPIC
158165
CXXFLAGS += -fPIC
159166
LDFLAGS += -fPIC
160167
endif
168+
endif
161169

162170
include Makefile.conf
163171
OBJECTS = $(addprefix src/,$(SOURCES:.cpp=.o))

0 commit comments

Comments
 (0)