Merge remote-tracking branch 'refs/remotes/facebook/dev' into dev11

# Conflicts:
#	lib/Makefile
This commit is contained in:
Przemyslaw Skibinski
2016-11-04 10:10:54 +01:00
8 changed files with 35 additions and 36 deletions
+2 -2
View File
@@ -75,8 +75,8 @@ $(LIBZSTD): $(ZSTD_FILES)
@$(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@
ifeq (,$(filter Windows%,$(OS)))
@echo creating versioned links
@ln -sf $@.$(SHARED_EXT_VER) libzstd.$(SHARED_EXT_MAJOR)
@ln -sf $@.$(SHARED_EXT_VER) libzstd.$(SHARED_EXT)
@ln -sf $(LIBZSTD) libzstd.$(SHARED_EXT_MAJOR)
@ln -sf $(LIBZSTD) libzstd.$(SHARED_EXT)
endif
libzstd : $(LIBZSTD)