ddidderr/zstd-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4076 from facebook/fix_macos_build

Browse Source 
fix macos build
This commit is contained in:
Yann Collet
2024-06-18 22:16:00 -07:00
committed by GitHub
parent 3242ac598e 80170f6aad
commit 17b5315016
3 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/dev-long-tests.yml
+3 -3
View File
@@ -31,12 +31,12 @@ jobs:
run: make test run: make test
# lasts ~26mn # lasts ~26mn
make-test-osx: make-test-macos:
runs-on: macos-latest runs-on: macos-latest
steps: steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # tag=v4.1.1 - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # tag=v4.1.1
- name: OS-X test - name: make test on macos
run: make test # make -c lib all doesn't work because of the fact that it's not a tty run: make test
# lasts ~24mn # lasts ~24mn
make-test-32bit: make-test-32bit:
lib/Makefile
-8
View File
@@ -298,14 +298,6 @@ PCLIBPREFIX := $(if $(findstring $(LIBDIR),$(PCLIBDIR)),,$${exec_prefix})
PCEXEC_PREFIX := $(if $(HAS_EXPLICIT_EXEC_PREFIX),$(EXEC_PREFIX),$${prefix}) PCEXEC_PREFIX := $(if $(HAS_EXPLICIT_EXEC_PREFIX),$(EXEC_PREFIX),$${prefix})
ifneq ($(MT),)
PCLIB :=
PCMTLIB := $(LDFLAGS_DYNLIB)
else
PCLIB := $(LDFLAGS_DYNLIB)
endif
ifneq ($(MT),) ifneq ($(MT),)
PCLIB := PCLIB :=
PCMTLIB := $(LDFLAGS_DYNLIB) PCMTLIB := $(LDFLAGS_DYNLIB)