summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann Collet <Cyan4973@users.noreply.github.com>2019-04-23 21:09:40 (GMT)
committerGitHub <noreply@github.com>2019-04-23 21:09:40 (GMT)
commit8c2ab8607e70cfa94e8ee74c887f2090ebcf8c34 (patch)
tree801d704c07c41850dace94092953cc70853248ab
parent2b68501ece2596bb40b27ffca1d1d8b54282d2fc (diff)
parent024216ef7394b6411eeaa5b52d0cec9953a44249 (diff)
downloadlz4-8c2ab8607e70cfa94e8ee74c887f2090ebcf8c34.zip
lz4-8c2ab8607e70cfa94e8ee74c887f2090ebcf8c34.tar.gz
lz4-8c2ab8607e70cfa94e8ee74c887f2090ebcf8c34.tar.bz2
Merge pull request #695 from lembacon/makefile-os
lib/Makefile: Fix detection of `Darwin`.
-rw-r--r--lib/Makefile5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/Makefile b/lib/Makefile
index 330642a..8f21d3d 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -55,10 +55,11 @@ FLAGS = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
SRCFILES := $(sort $(wildcard *.c))
+include ../Makefile.inc
# OS X linker doesn't support -soname, and use different extension
# see : https://developer.apple.com/library/mac/documentation/DeveloperTools/Conceptual/DynamicLibraries/100-Articles/DynamicLibraryDesignGuidelines.html
-ifeq ($(OS), Darwin)
+ifeq ($(TARGET_OS), Darwin)
SHARED_EXT = dylib
SHARED_EXT_MAJOR = $(LIBVER_MAJOR).$(SHARED_EXT)
SHARED_EXT_VER = $(LIBVER).$(SHARED_EXT)
@@ -70,8 +71,6 @@ else
SHARED_EXT_VER = $(SHARED_EXT).$(LIBVER)
endif
-include ../Makefile.inc
-
.PHONY: default
default: lib-release