]> git-server-git.apps.pok.os.sepia.ceph.com Git - rocksdb.git/commitdiff
Add LDFLAGS to Java static library
authorDerekSchenk <derek@schenk.ca>
Wed, 20 May 2015 03:04:02 +0000 (23:04 -0400)
committerIgor Canadi <icanadi@fb.com>
Wed, 3 Jun 2015 17:20:49 +0000 (13:20 -0400)
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

index 0afa377a8461419aa97ce0251baffe8c1b5e78a6..46de0cebd16c84eeb272a5db805b726f774a8232 100644 (file)
--- 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)