Skip to content

Commit

Permalink
Fixes #257: Use a patched version of crossbuild Docker image for mac6…
Browse files Browse the repository at this point in the history
…4 target (#264)
  • Loading branch information
xerial committed Oct 22, 2020
1 parent 5df2667 commit 9532de9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docker/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 9532de9

Please sign in to comment.