From 3e081754181c3ac436b84931d57874f4243255e4 Mon Sep 17 00:00:00 2001 From: DerekSchenk Date: Tue, 19 May 2015 23:04:02 -0400 Subject: [PATCH] Add LDFLAGS to Java static library Includes the LDFLAGS so that the correct libraries will be linked. This links rt to resolve the issue https://github.com/facebook/rocksdb/issues/606. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0afa377a8..46de0cebd 100644 --- a/Makefile +++ b/Makefile @@ -939,7 +939,7 @@ rocksdbjavastatic: $(java_libobjects) libz.a libbz2.a libsnappy.a liblz4.a $(CXX) $(CXXFLAGS) -I./java/. $(JAVA_INCLUDE) -shared -fPIC \ -o ./java/target/$(ROCKSDBJNILIB) $(JNI_NATIVE_SOURCES) \ $(java_libobjects) $(COVERAGEFLAGS) \ - libz.a libbz2.a libsnappy.a liblz4.a + libz.a libbz2.a libsnappy.a liblz4.a $(LDFLAGS) cd java/target;strip -S -x $(ROCKSDBJNILIB) cd java;jar -cf target/$(ROCKSDB_JAR) HISTORY*.md cd java/target;jar -uf $(ROCKSDB_JAR) $(ROCKSDBJNILIB)