Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make Makefile compatible with GNU Make >= 3.79.1 #2853

Merged
merged 1 commit into from
Mar 30, 2019
Merged

Make Makefile compatible with GNU Make >= 3.79.1 #2853

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions Makefile
View file
Open in desktop
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