diff options
| author | Amir Sanjar <afsanjar@gmail.com> | 2020-10-14 17:37:55 +0000 |
|---|---|---|
| committer | Andrew Kryczka <andrewkr@fb.com> | 2020-10-14 10:53:27 -0700 |
| commit | bfdb0a7651672427ee62ed9e489a8f7f4235e2fc (patch) | |
| tree | 8e2c5f3899723ef484b03c5dc84db88232be5e63 | |
| parent | 7885d8f9bdf9a5ae7cfa91cdea91944f14dd3197 (diff) | |
Fix a build issue with RocksJava on ppc64le that was introduced in https://github.com/facebook/rocksdb/pull/6660
This was fixed in https://github.com/facebook/rocksdb/pull/7359 and this commit is just a partial back-port of the necessary parts of that PR.
| -rw-r--r-- | Makefile | 11 |
1 files changed, 2 insertions, 9 deletions
@@ -2091,13 +2091,6 @@ rocksdbjavastaticpublishcentral: jl/%.o: %.cc $(AM_V_CC)mkdir -p $(@D) && $(CXX) $(CXXFLAGS) -fPIC -c $< -o $@ $(COVERAGEFLAGS) -jl/crc32c_ppc.o: util/crc32c_ppc.c - $(AM_V_CC)$(CC) $(CFLAGS) -c $< -o $@ - -jl/crc32c_ppc_asm.o: util/crc32c_ppc_asm.S - $(AM_V_CC)$(CC) $(CFLAGS) -c $< -o $@ - - rocksdbjava: $(LIB_OBJECTS) $(AM_V_GEN)cd java;$(MAKE) javalib; $(AM_V_at)rm -f ./java/target/$(ROCKSDBJNILIB) @@ -2159,7 +2152,7 @@ ifeq ($(HAVE_POWER8),1) $(OBJ_DIR)/util/crc32c_ppc.o: util/crc32c_ppc.c $(AM_V_CC)$(CC) $(CFLAGS) -c $< -o $@ -+$(OBJ_DIR)/util/crc32c_ppc_asm.o: util/crc32c_ppc_asm.S +$(OBJ_DIR)/util/crc32c_ppc_asm.o: util/crc32c_ppc_asm.S $(AM_V_CC)$(CC) $(CFLAGS) -c $< -o $@ endif $(OBJ_DIR)/%.o: %.cc @@ -2205,7 +2198,7 @@ $(OBJ_DIR)/%.c.d: %.c @$(CXX) $(CXXFLAGS) $(PLATFORM_SHARED_CFLAGS) \ -MM -MT'$@' -MT'$(<:.c=.o)' "$<" -o '$@' -+$(OBJ_DIR)/%.S.d: %.S +$(OBJ_DIR)/%.S.d: %.S @$(CXX) $(CXXFLAGS) $(PLATFORM_SHARED_CFLAGS) \ -MM -MT'$@' -MT'$(<:.S=.o)' "$<" -o '$@' |