diff options
| author | Yann Collet <Cyan4973@users.noreply.github.com> | 2019-04-23 22:08:46 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-23 22:08:46 (GMT) |
| commit | 49c20c498b80e70bae3ae604ef468921d79d2121 (patch) | |
| tree | 801d704c07c41850dace94092953cc70853248ab | |
| parent | f665291e6cb651cb084bf9450a071ae0fd494782 (diff) | |
| parent | 8c2ab8607e70cfa94e8ee74c887f2090ebcf8c34 (diff) | |
| download | lz4-49c20c498b80e70bae3ae604ef468921d79d2121.zip lz4-49c20c498b80e70bae3ae604ef468921d79d2121.tar.gz lz4-49c20c498b80e70bae3ae604ef468921d79d2121.tar.bz2 | |
Merge pull request #696 from lz4/mactest
Fix dynamic library compilation on Mac OS-X
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | lib/Makefile | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 2065478..c684b6c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,11 @@ matrix: os: osx compiler: clang script: + - make # test library build + - make clean - make -C tests test-lz4 MOREFLAGS='-Werror -Wconversion -Wno-sign-conversion' | tee # test scenario where `stdout` is not the console - - CFLAGS=-m32 make -C tests clean test-lz4-contentSize + - make clean + - CFLAGS=-m32 make -C tests test-lz4-contentSize # Container-based 12.04 LTS Server Edition 64 bit (doesn't support 32-bit includes) - name: (Precise) benchmark test 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 |