From: Jens Axboe <axboe@kernel.dk>
Date: Mon, 6 Nov 2017 16:11:07 +0000 (-0700)
Subject: Merge branch 'fix-libhdfs' of https://github.com/follitude/fio
X-Git-Tag: fio-3.3~76
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=3b973af558aa0802e2c8193e9afac4cd49af3ca0;hp=9f50b4106bd1d6fa1c325900d1fb286832ccc5e8

Merge branch 'fix-libhdfs' of https://github.com/follitude/fio
---

diff --git a/Makefile b/Makefile
index 76243ffb..2893348a 100644
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,7 @@ SOURCE :=	$(sort $(patsubst $(SRCDIR)/%,%,$(wildcard $(SRCDIR)/crc/*.c)) \
 
 ifdef CONFIG_LIBHDFS
   HDFSFLAGS= -I $(JAVA_HOME)/include -I $(JAVA_HOME)/include/linux -I $(FIO_LIBHDFS_INCLUDE)
-  HDFSLIB= -Wl,-rpath $(JAVA_HOME)/jre/lib/$(FIO_HDFS_CPU)/server -L$(JAVA_HOME)/jre/lib/$(FIO_HDFS_CPU)/server -ljvm $(FIO_LIBHDFS_LIB)/libhdfs.a
+  HDFSLIB= -Wl,-rpath $(JAVA_HOME)/jre/lib/$(FIO_HDFS_CPU)/server -L$(JAVA_HOME)/jre/lib/$(FIO_HDFS_CPU)/server $(FIO_LIBHDFS_LIB)/libhdfs.a -ljvm
   CFLAGS += $(HDFSFLAGS)
   SOURCE += engines/libhdfs.c
 endif