Updated Branches: refs/heads/master cdc1dc9f0 -> 2505f7a8c
ACCUMULO-1819 Update Makefile for native map to build on new OSX version Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0e882211 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0e882211 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0e882211 Branch: refs/heads/master Commit: 0e882211f2bda4bfb544463e076eea0fdd7dd3e9 Parents: 7bf6148 Author: Josh Elser <els...@apache.org> Authored: Sun Oct 27 23:54:57 2013 -0400 Committer: Josh Elser <els...@apache.org> Committed: Sun Oct 27 23:54:57 2013 -0400 ---------------------------------------------------------------------- src/server/src/main/c++/nativeMap/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0e882211/src/server/src/main/c++/nativeMap/Makefile ---------------------------------------------------------------------- diff --git a/src/server/src/main/c++/nativeMap/Makefile b/src/server/src/main/c++/nativeMap/Makefile index 56fe773..e3c67db 100644 --- a/src/server/src/main/c++/nativeMap/Makefile +++ b/src/server/src/main/c++/nativeMap/Makefile @@ -24,7 +24,11 @@ endif ifeq ($(shell uname),Darwin) LIBS:= libNativeMap-Mac_OS_X-x86_64-64.jnilib -CXXFLAGS=-m64 -dynamiclib -O3 -I/System/Library/Frameworks/JavaVM.framework/Headers +# Update flags for OSX-10.9 and Xcode 5.0.1 +# I think that we should be able to remove the `-undefined dynamic_lookup` option, +# but I don't know exactly how to go about this. +CXXFLAGS=-m64 -dynamiclib -undefined dynamic_lookup -O3 -I/System/Library/Frameworks/JavaVM.framework/Headers -I${JAVA_HOME}/include -I${JAVA_HOME}/include/darwin \ + -I/usr/include/c++/4.2.1 endif INSTALL_DIR=../../../../../../lib/native/map
