From: Yann Collet <cyan@fb.com>
Date: Wed, 19 Jun 2024 03:21:25 +0000 (-0700)
Subject: fix macos build
X-Git-Tag: v1.5.7^2~110^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F4076%2Fhead;p=thirdparty%2Fzstd.git

fix macos build

weird: after replacing the UNAME line with an identical one,
it does work properly now(??).
Possibly a case of hidden special character?
---

diff --git a/.github/workflows/dev-long-tests.yml b/.github/workflows/dev-long-tests.yml
index cf73acac1..82e893cb9 100644
--- a/.github/workflows/dev-long-tests.yml
+++ b/.github/workflows/dev-long-tests.yml
@@ -31,12 +31,12 @@ jobs:
       run: make test
 
   # lasts ~26mn
-  make-test-osx:
+  make-test-macos:
     runs-on: macos-latest
     steps:
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # tag=v4.1.1
-    - name: OS-X test
-      run: make test # make -c lib all doesn't work because of the fact that it's not a tty
+    - name: make test on macos
+      run: make test
 
   # lasts ~24mn
   make-test-32bit:
diff --git a/lib/Makefile b/lib/Makefile
index ccfdfedd6..020d2ff5d 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -298,14 +298,6 @@ PCLIBPREFIX := $(if $(findstring $(LIBDIR),$(PCLIBDIR)),,$${exec_prefix})
 PCEXEC_PREFIX := $(if $(HAS_EXPLICIT_EXEC_PREFIX),$(EXEC_PREFIX),$${prefix})
 
 
-ifneq ($(MT),)
-  PCLIB :=
-  PCMTLIB := $(LDFLAGS_DYNLIB)
-else
-  PCLIB := $(LDFLAGS_DYNLIB)
-endif
-
-
 ifneq ($(MT),)
   PCLIB :=
   PCMTLIB := $(LDFLAGS_DYNLIB)
diff --git a/lib/libzstd.mk b/lib/libzstd.mk
index a2a965037..d89817f14 100644
--- a/lib/libzstd.mk
+++ b/lib/libzstd.mk
@@ -206,7 +206,7 @@ endif
 endif
 CPPFLAGS  += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT)
 
-UNAME := $(shell sh -c 'MSYSTEM="MSYS" uname') 
+UNAME := $(shell sh -c 'MSYSTEM="MSYS" uname')
 
 ifndef BUILD_DIR
 ifeq ($(UNAME), Darwin)