@@ -1,5 +1,7 @@ #!/usr/bin/env ruby +require 'tempfile' + root = File.expand_path File.dirname(__FILE__) require File.join(root, "kernel", "delta", "options") @@ -13,6 +15,7 @@ class Configure @llvm_path = nil @llvm_configure = nil @prefix = nil + @defines = [] @llvm_svn_dir = File.join(root, "vm", "external_libs", "llvm") @@ -177,6 +180,37 @@ class Configure false end + def has_function(name, includes=[]) + print "Checking for function '#{name}': " + tf = Tempfile.new("rbx-test") + includes.each do |i| + tf.puts "#include <#{i}>" + end + + tf.puts "int main() { void* ptr = &#{name}; }" + + tf.close + + `#{compiler} -o /dev/null -x c #{tf.path} 2>&1` + status = ($?.exitstatus == 0) + + tf.unlink + + if status + puts "found!" + else + puts "not found." + end + + return status + end + + def detect_features + if has_function("backtrace", "execinfo.h") + @defines << "HAS_EXECINFO" + end + end + def process print "Using LLVM: " case @llvm @@ -202,6 +236,8 @@ class Configure else puts "unknown value '#{@llvm}'" end + + detect_features end def arch @@ -220,7 +256,12 @@ class Configure f.puts " :llvm_configure => '#{@llvm_configure}'," f.puts " :arch => '#{arch()}'," f.puts " :prefix => #{@prefix.inspect}," - f.puts " :compiler => '#{compiler}'" + f.puts " :compiler => '#{compiler}'," + if @defines.empty? + f.puts " :defines => []" + else + f.puts " :defines => ['#{@defines.join(', ')}']" + end f.puts "}" f.puts "end" end configure @@ -186,6 +186,10 @@ if LLVM_ENABLE =end end +Rubinius::BUILD_CONFIG[:defines].each do |flag| + FLAGS << "-D#{flag}" +end + BUILD_PRETASKS = [] if ENV['DEV'] rakelib/vm.rake @@ -33,7 +33,7 @@ /** CONFIGURE */ -#ifndef OS_X_ANCIENT +#ifdef HAS_EXECINFO #define USE_EXECINFO #endif vm/detection.hpp e3e230646aa1330c19727b3fde6bf38248733a6c Evan Phoenix ephoenix@engineyard.com http://github.com/evanphx/rubinius/commit/7310df71768b660072a7a202e0fffadf712b5a97 7310df71768b660072a7a202e0fffadf712b5a97 2009-10-12T13:33:05-07:00 2009-10-12T13:32:29-07:00 Do proper libc function detection Detect if backtrace() is actually available 28d3a3eaae12ad05b1aa35487491caa7f86d70b0 Evan Phoenix ephoenix@engineyard.com