Permalink
Browse files

hot fixes to Mac config scripts, first version of ATLAS

but performance ain't good :(
  • Loading branch information...
1 parent 2ab7ee1 commit 2878662c131190aeabea08d9d56227c8a15c355e Mikio Braun committed Jan 23, 2013
View
@@ -96,12 +96,13 @@
EOS
end
when 'Mac\ OS\ X'
- Path.check_cmd('gcc-mp-4.3', 'make')
+ #Path.check_cmd('gcc-mp-4.3', 'make')
+ Path.check_cmd('gcc', 'make')
JblasConfig::CONFIG << <<EOS
-CC = gcc-mp-4.3
-LD = gcc-mp-4.3
+CC = gcc
+LD = gcc
CFLAGS = -fPIC
-INCDIRS += -Iinclude -I#{java_home}/include
+INCDIRS += -Iinclude -I#{java_home}/include -I#{java_home}/include/darwin
SO = jnilib
LIB = lib
RUBY = ruby
@@ -120,4 +121,4 @@
if __FILE__ == $0
ConfigureTask.run :cc
-end
+end
View
@@ -51,7 +51,7 @@
if CONFIG['OS_NAME'] == 'Mac\ OS\ X'
CONFIG['LD'] = CONFIG['CC']
- CONFIG['F77'] = 'gfortran-mp-4.3'
+ CONFIG['F77'] = 'gfortran'
CONFIG['CCC'] = 'c99'
elsif CONFIG['OS_NAME'] == 'Windows' and CONFIG['OS_ARCH'] == 'amd64'
CONFIG['LD'] = W64_PREFIX + 'gfortran'
View
@@ -57,9 +57,9 @@
else
java_home = dir(File.dirname(%x(java -cp config PrintProperty java.home)))
end
- if CONFIG['OS_NAME'] == 'Mac\ OS\ X'
- java_home = File.join(java_home, 'Home')
- end
+ #if CONFIG['OS_NAME'] == 'Mac\ OS\ X'
+ # java_home = File.join(java_home, 'Home')
+ #end
check_files java_home, ['include', 'jni.h'] do
CONFIG['JAVA_HOME'] = java_home #.escape
end
@@ -68,4 +68,4 @@
if __FILE__ == $0
ConfigureTask.run :java
-end
+end
View
Binary file not shown.
View
@@ -60,6 +60,8 @@ static jobject createObject(JNIEnv *env, const char *className, const char *sign
va_start(args, signature);
newObject = (*env)->NewObjectV(env, klass, init, args);
va_end(args);
+
+ return newObject;
}
<% if $complexcc == 'f2c' %>
View
@@ -60,6 +60,8 @@ static jobject createObject(JNIEnv *env, const char *className, const char *sign
va_start(args, signature);
newObject = (*env)->NewObjectV(env, klass, init, args);
va_end(args);
+
+ return newObject;
}
Oops, something went wrong.

0 comments on commit 2878662

Please sign in to comment.