[Gridflow-cvs] [svn] commit: r6713 - /trunk/configure

svn-gridflow at artengine.ca svn-gridflow at artengine.ca
Sat Mar 5 18:03:21 EST 2011


Author: matju
Date: Sat Mar  5 18:03:21 2011
New Revision: 6713

Log:
prepend path for our osx build in PdLab; fix Exception bug in gcc3 test; add 'universal' as being a sign of pentiumness

Modified:
    trunk/configure

Modified: trunk/configure
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Sat Mar  5 18:03:21 2011
@@ -180,6 +180,7 @@
 prepend_path "/sw" if OSX
 prepend_path "/usr/local"
 prepend_path ENV["HOME"]
+prepend_path "/Users/pddev/..."
 CFLAGS << " -I."
 C_INCLUDE_PATH.unshift "."
 
@@ -196,7 +197,7 @@
 	status :always_check
 	defines :GCC_VERSION => proc {
 		begin  /GCC_VERSION\s+(.*)/.match(File.popen("tmp/#{$$}","r"){|f| f.read })[1]
-		rescue "3.666" # version number unknown, sorry.
+		rescue Exception; "3.666" # version number unknown, sorry.
 		end
 	}
 	test proc {c_test %{
@@ -229,7 +230,7 @@
 	action proc { (CONFIG["arch"] =~ /i\d86/) and DEFINES[:CPU] ||= "pentium" }
 	options ["HAVE_PENTIUM"]
 	test proc {
-		(CONFIG["arch"] =~ /(i\d86|x86_64)/) or raise "#{CONFIG["arch"]} instead"
+		(CONFIG["arch"] =~ /(i\d86|x86_64|universal)/) or raise "#{CONFIG["arch"]} instead"
 		c_test '#define cpuid(func,ax,bx,cx,dx) \
 			__asm__ __volatile__("cpuid":"=a"(ax),"=b"(bx),"=c"(cx),"=d"(dx):"a"(func))
 		#include <stdio.h>



More information about the Gridflow-cvs mailing list