Skip to content

Commit

Permalink
Merge pull request #3614 from mredig/darwin-fat
Browse files Browse the repository at this point in the history
add makefile entry to build fat binary on macos
  • Loading branch information
Cyan4973 committed Apr 19, 2023
2 parents 504c4a1 + 0a79416 commit 189653a
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 0 deletions.
9 changes: 9 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,15 @@ uninstall:
travis-install:
$(MAKE) install PREFIX=~/install_test_dir

.PHONY: clangbuild-darwin-fat
clangbuild-darwin-fat: clean
clang -v
CXX=clang++ CC=clang CFLAGS="-Werror -Wconversion -Wno-sign-conversion -Wdocumentation -arch arm64" $(MAKE) zstd-release
mv programs/zstd programs/zstd_arm64
CXX=clang++ CC=clang CFLAGS="-Werror -Wconversion -Wno-sign-conversion -Wdocumentation -arch x86_64" $(MAKE) zstd-release
mv programs/zstd programs/zstd_x64
lipo -create programs/zstd_x64 programs/zstd_arm64 -output programs/zstd

.PHONY: gcc5build gcc6build gcc7build clangbuild m32build armbuild aarch64build ppcbuild ppc64build
gcc5build: clean
gcc-5 -v
Expand Down
2 changes: 2 additions & 0 deletions programs/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ zstd-small
zstd-nolegacy
zstd-dictBuilder
zstd-dll
zstd_arm64
zstd_x64

# Object files
*.o
Expand Down

0 comments on commit 189653a

Please sign in to comment.