Skip to content

Commit 58eef84

Browse files
author
extempore
committed
Tracked down why the jvm/natives.scala fails for me and apparently
not anyone else. Rebuilt libnatives.jnlib to accomodate x86-64, and it seems to pass. No review. git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@22168 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
1 parent be42cce commit 58eef84

File tree

2 files changed

+1
-1
lines changed

2 files changed

+1
-1
lines changed

test/files/jvm/libnatives.jnilib

100644100755
-4.11 KB
Binary file not shown.

test/files/jvm/mkLibNatives.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ JAVAH_OPTIONS="-jni -force -classpath ${CLASS_DIR} -o ${OBJ_NAME}.h"
3737
CC=gcc
3838

3939
if $darwin; then
40-
CC_OPTIONS="-c -arch ppc -arch i386"
40+
CC_OPTIONS="-c -arch ppc -arch i386 -arch x86_64"
4141
CC_INCLUDES="-I/System/Library/Frameworks/JavaVM.framework/Headers"
4242
LNK_OPTIONS="-dynamiclib -framework JavaVM"
4343
FULL_LIB_NAME=${LIB_NAME}.jnilib

0 commit comments

Comments
 (0)