tyler.durden
/
snappy-java
mirror of https://github.com/xerial/snappy-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes #257: Use a patched version of crossbuild Docker image for mac64 target (#264)

This commit is contained in:
Taro L. Saito 2020-10-22 14:28:39 -07:00 committed by GitHub
parent 5df2667f0e
commit 9532de9459
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -144,7 +144,7 @@ native: jni-header snappy-header $(NATIVE_DLL)
native-nocmake: jni-header $(NATIVE_DLL)
snappy: native $(TARGET)/$(snappy-jar-version).jar
native-all: native win32 win64 native-arm linux32 linux64 linux-ppc64le
native-all: native mac64 win32 win64 native-arm linux32 linux64 linux-ppc64le
$(NATIVE_DLL): $(SNAPPY_OUT)/$(LIBNAME)
@mkdir -p $(@D)
@ -172,7 +172,6 @@ win64: jni-header
mac32: jni-header
$(MAKE) native OS_NAME=Mac OS_ARCH=x86
# TODO: This command no longer works as the crossbuild docker image contains no cross compiler for Mac OS X (Darwin)
mac64: jni-header
docker run -it $(DOCKER_RUN_OPTS) -v $$PWD:/workdir -e CROSS_TRIPLE=x86_64-apple-darwin xerial/crossbuild make clean-native native OS_NAME=Mac OS_ARCH=x86_64

2
docker/Makefile
View File

@ -6,4 +6,4 @@ centos5-image:
# docker push xerial/centos5-linux-x86_64:latest
multiarch-crossbuild-image:
docker build https://github.com/multiarch/crossbuild.git -t xerial/crossbuild:latest
docker build https://github.com/iwasakims/crossbuild.git#fix-osxcross-cmake -t xerial/crossbuild:latest