ACCUMULO-1884 Fix NativeMap Makefile for OS X The NativeMap Makefile was originally updated for recent OS X versions under ACCUMULO-1819, but when the file moved for 1.6.x, the changes were not included.
Signed-off-by: Eric Newton <eric.new...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e5dfd06c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e5dfd06c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e5dfd06c Branch: refs/heads/master Commit: e5dfd06ce9f52b606984c1331f6ee2c155f44d1d Parents: 5ded019 Author: Bill Havanki <bhava...@cloudera.com> Authored: Tue Nov 12 11:09:35 2013 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Wed Nov 13 13:04:15 2013 -0500 ---------------------------------------------------------------------- server/native/src/main/resources/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/e5dfd06c/server/native/src/main/resources/Makefile ---------------------------------------------------------------------- diff --git a/server/native/src/main/resources/Makefile b/server/native/src/main/resources/Makefile index 1c1f872..6309e6d 100644 --- a/server/native/src/main/resources/Makefile +++ b/server/native/src/main/resources/Makefile @@ -30,7 +30,7 @@ ifeq ($(shell uname),Darwin) # 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$(JAVA_HOME)/include -I$(JAVA_HOME)/include/darwin -I/usr/include/c++/4.2.1 -Ijavah + 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 -Ijavah endif all : $(NATIVE_LIB) @@ -44,7 +44,7 @@ testJavaHome : @echo JAVA_HOME is $(JAVA_HOME) runTests : $(NATIVE_LIB) $(TESTSRCS) - $(CXX) -g -Wall -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -InativeMap -o $@ $(TESTSRCS) $(NATIVE_LIB) + $(CXX) -g -Wall -I/System/Library/Frameworks/JavaVM.framework/Headers -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -InativeMap -o $@ $(TESTSRCS) $(NATIVE_LIB) LD_LIBRARY_PATH=./ ./$@ 20 20 20 20 20 20 20 20 true clean :
