Merge branch 'master' of https://github.com/davidzengxhsh/fio
authorJens Axboe <axboe@fb.com>
Fri, 20 May 2016 17:22:37 +0000 (11:22 -0600)
committerJens Axboe <axboe@fb.com>
Fri, 20 May 2016 17:22:37 +0000 (11:22 -0600)
Makefile

index 0133ac4..108e6ee 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,7 @@ SOURCE :=     $(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/amd64/server -L$(JAVA_HOME)/jre/lib/amd64/server -ljvm $(FIO_LIBHDFS_LIB)/libhdfs.a
+  HDFSLIB= -Wl,-rpath $(JAVA_HOME)/jre/lib/`uname -m`/server -L$(JAVA_HOME)/jre/lib/`uname -m`/server -ljvm $(FIO_LIBHDFS_LIB)/libhdfs.a
   CFLAGS += $(HDFSFLAGS)
   SOURCE += engines/libhdfs.c
 endif