From 4bafb5aa9712d5645a6faefc211dd47aa3818118 Mon Sep 17 00:00:00 2001
From: Nick Terrell <terrelln@fb.com>
Date: Thu, 3 Nov 2016 11:32:45 -0700
Subject: [PATCH 1/2] The static library was moved to libzstd.a

---
 contrib/pzstd/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/contrib/pzstd/Makefile b/contrib/pzstd/Makefile
index 2de50416..ad0e5567 100644
--- a/contrib/pzstd/Makefile
+++ b/contrib/pzstd/Makefile
@@ -170,8 +170,7 @@ roundtrip: test/RoundTripTest$(EXT)
 # Use the static library that zstd builds for simplicity and
 # so we get the compiler options correct
 $(ZSTDDIR)/libzstd.a: $(ZSTD_FILES)
-	$(MAKE) -C $(ZSTDDIR) libzstd CFLAGS="$(ALL_CFLAGS)" LDFLAGS="$(ALL_LDFLAGS)"
-
+	CFLAGS="$(ALL_CFLAGS)" LDFLAGS="$(ALL_LDFLAGS)" $(MAKE) -C $(ZSTDDIR) libzstd.a
 
 # Rules to build the tests
 test/RoundTripTest$(EXT): test/RoundTripTest.o $(PROGDIR)/datagen.o Options.o \

From c8a9ac312b11c4c48cc97ff9f21854a60770b5b5 Mon Sep 17 00:00:00 2001
From: Nick Terrell <terrelln@fb.com>
Date: Thu, 3 Nov 2016 12:32:48 -0700
Subject: [PATCH 2/2] Fix dynamic libzstd symlinks

---
 lib/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Makefile b/lib/Makefile
index 04ebe26b..a7df44f2 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -74,8 +74,8 @@ $(LIBZSTD): $(ZSTD_FILES)
 	@echo compiling dynamic library $(LIBVER)
 	@$(CC) $(FLAGS) $^ $(LDFLAGS) $(SONAME_FLAGS) -o $@
 	@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)
 
 libzstd : $(LIBZSTD)