]> git-server-git.apps.pok.os.sepia.ceph.com Git - rocksdb.git/commitdiff
Fix PowerPC dynamic java build
authorSagar Vemuri <svemuri@fb.com>
Fri, 12 Jan 2018 18:53:43 +0000 (10:53 -0800)
committersdong <siying.d@fb.com>
Fri, 19 Jan 2018 02:02:26 +0000 (18:02 -0800)
Summary:
Java build on PPC64le has been broken since a few months, due to #2716. Fixing it with the least amount of changes.
(We should cleanup a little around this code when time permits).

This should fix the build failures seen in http://140.211.168.68:8080/job/Rocksdb/ .
Closes https://github.com/facebook/rocksdb/pull/3359

Differential Revision: D6712938

Pulled By: sagar0

fbshipit-source-id: 3046e8f072180693de2af4762934ec1ace309ca4

Makefile

index 473da64f8853cc1111fd193c5e5242451b12d4fb..f37ba1a393d8f379367e6a16bd1d085202ab07d5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1749,7 +1749,7 @@ JAVA_C_LIBOBJECTS = $(patsubst %.c.o,jl/%.c.o,$(JAVA_C_OBJECTS))
 JAVA_ASM_LIBOBJECTS = $(patsubst %.S.o,jl/%.S.o,$(JAVA_ASM_OBJECTS))
 endif
 
-java_libobjects = $(patsubst %,jl/%,$(LIBOBJECTS))
+java_libobjects = $(patsubst %,jl/%,$(LIB_CC_OBJECTS))
 CLEAN_FILES += jl
 java_all_libobjects = $(java_libobjects)