From 2050492fd001e2422b6739fa859faf5e8e10f795 Mon Sep 17 00:00:00 2001 From: Alan Dipert Date: Fri, 29 Mar 2019 17:34:29 -0700 Subject: [PATCH] Make Makefile compatible with GNU Make >= 3.79.1 (#2853) --- Makefile | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index f91d86843..9fea21f46 100644 --- a/Makefile +++ b/Makefile @@ -28,15 +28,21 @@ CAT ?= $(if $(filter $(OS),Windows_NT),type,cat) ifneq (,$(findstring /cygdrive/,$(PATH))) UNAME := Cygwin -else ifneq (,$(findstring Windows_NT,$(OS))) +else +ifneq (,$(findstring Windows_NT,$(OS))) UNAME := Windows -else ifneq (,$(findstring mingw32,$(MAKE))) +else +ifneq (,$(findstring mingw32,$(MAKE))) UNAME := Windows -else ifneq (,$(findstring MINGW32,$(shell uname -s))) +else +ifneq (,$(findstring MINGW32,$(shell uname -s))) UNAME := Windows else UNAME := $(shell uname -s) endif +endif +endif +endif ifndef LIBSASS_VERSION ifneq ($(wildcard ./.git/ ),) @@ -153,11 +159,13 @@ ifeq (Windows,$(UNAME)) CXXFLAGS += -D ADD_EXPORTS LIB_SHARED = $(SASS_LIBSASS_PATH)/lib/libsass.dll endif -else ifneq (Cygwin,$(UNAME)) +else +ifneq (Cygwin,$(UNAME)) CFLAGS += -fPIC CXXFLAGS += -fPIC LDFLAGS += -fPIC endif +endif include Makefile.conf OBJECTS = $(addprefix src/,$(SOURCES:.cpp=.o))