Skip to content

Commit

Permalink
Make Makefile compatible with GNU Make >= 3.79.1 (sass#2853)
Browse files Browse the repository at this point in the history
  • Loading branch information
alandipert authored and xzyfer committed Mar 30, 2019
1 parent 6df8cd9 commit 2050492
Showing 1 changed file with 12 additions and 4 deletions.
16 changes: 12 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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/ ),)
Expand Down Expand Up @@ -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))
Expand Down

0 comments on commit 2050492

Please sign in to comment.