瀏覽代碼

HADOOP-841. Fix native library to build 32-bit version even when on a 64-bit host, if a 32-bit JVM is specified. Contributed by Arun.

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk@489190 13f79535-47bb-0310-9956-ffa450edef68
Doug Cutting 18 年之前
父節點
當前提交
2625ddfc3d
共有 3 個文件被更改,包括 5 次插入2 次删除
  1. 3 0
      CHANGES.txt
  2. 1 1
      src/native/lib/Makefile.am
  3. 1 1
      src/native/lib/Makefile.in

+ 3 - 0
CHANGES.txt

@@ -146,6 +146,9 @@ Trunk (unreleased changes)
     hadoop.tmp.dir, rather than the system temporary directory.
     (Hairong Kuang via cutting)
 
+41. HADOOP-841.  Fix native library to build 32-bit version even when
+    on a 64-bit host, if a 32-bit JVM is used.  (Arun C Murthy via cutting)
+
 
 Release 0.9.2 - 2006-12-15
 

+ 1 - 1
src/native/lib/Makefile.am

@@ -32,7 +32,7 @@
 
 # Add .lo files in $(SUBDIRS) to construct libhadoop.so
 HADOOP_OBJS = $(foreach path,$(addprefix ../,$(SUBDIRS)),$(wildcard $(path)/*.lo))
-AM_LDFLAGS = @JNI_LDFLAGS@
+AM_LDFLAGS = @JNI_LDFLAGS@ -m$(JVM_DATA_MODEL)
 
 lib_LTLIBRARIES = libhadoop.la
 libhadoop_la_SOURCES = 

+ 1 - 1
src/native/lib/Makefile.in

@@ -205,7 +205,7 @@ target_alias = @target_alias@
 
 # Add .lo files in $(SUBDIRS) to construct libhadoop.so
 HADOOP_OBJS = $(foreach path,$(addprefix ../,$(SUBDIRS)),$(wildcard $(path)/*.lo))
-AM_LDFLAGS = @JNI_LDFLAGS@
+AM_LDFLAGS = @JNI_LDFLAGS@ -m$(JVM_DATA_MODEL)
 lib_LTLIBRARIES = libhadoop.la
 libhadoop_la_SOURCES = 
 libhadoop_la_LDFLAGS = -version-info 1:0:0