diff options
author | Paul Phillips <paulp@improving.org> | 2010-06-04 19:15:10 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2010-06-04 19:15:10 +0000 |
commit | 84b86a977ea090c66e128b26e1b7643fd50a99a1 (patch) | |
tree | c49bb752d67d9d04715c09a00b387242fa34b553 | |
parent | da5910c7c622fc248fe525f5c03b1dee6be384b5 (diff) | |
download | scala-84b86a977ea090c66e128b26e1b7643fd50a99a1.tar.gz scala-84b86a977ea090c66e128b26e1b7643fd50a99a1.tar.bz2 scala-84b86a977ea090c66e128b26e1b7643fd50a99a1.zip |
Tracked down why the jvm/natives.scala fails fo...
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.
-rwxr-xr-x[-rw-r--r--] | test/files/jvm/libnatives.jnilib | bin | 8456 -> 4248 bytes | |||
-rwxr-xr-x | test/files/jvm/mkLibNatives.sh | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/test/files/jvm/libnatives.jnilib b/test/files/jvm/libnatives.jnilib Binary files differindex daac50e3df..1fc104883a 100644..100755 --- a/test/files/jvm/libnatives.jnilib +++ b/test/files/jvm/libnatives.jnilib diff --git a/test/files/jvm/mkLibNatives.sh b/test/files/jvm/mkLibNatives.sh index ed80c24c3e..537187eedd 100755 --- a/test/files/jvm/mkLibNatives.sh +++ b/test/files/jvm/mkLibNatives.sh @@ -37,7 +37,7 @@ JAVAH_OPTIONS="-jni -force -classpath ${CLASS_DIR} -o ${OBJ_NAME}.h" CC=gcc if $darwin; then - CC_OPTIONS="-c -arch ppc -arch i386" + CC_OPTIONS="-c -arch ppc -arch i386 -arch x86_64" CC_INCLUDES="-I/System/Library/Frameworks/JavaVM.framework/Headers" LNK_OPTIONS="-dynamiclib -framework JavaVM" FULL_LIB_NAME=${LIB_NAME}.jnilib |