[macruby-changes] [3066] MacRuby/trunk/rakelib/builder.rb
source_changes at macosforge.org
source_changes at macosforge.org
Mon Nov 30 19:02:17 PST 2009
Revision: 3066
http://trac.macosforge.org/projects/ruby/changeset/3066
Author: lsansonetti at apple.com
Date: 2009-11-30 19:02:13 -0800 (Mon, 30 Nov 2009)
Log Message:
-----------
llvm-config is now a rake variable
Modified Paths:
--------------
MacRuby/trunk/rakelib/builder.rb
Modified: MacRuby/trunk/rakelib/builder.rb
===================================================================
--- MacRuby/trunk/rakelib/builder.rb 2009-12-01 02:42:59 UTC (rev 3065)
+++ MacRuby/trunk/rakelib/builder.rb 2009-12-01 03:02:13 UTC (rev 3066)
@@ -28,6 +28,7 @@
else
do_option('archs', `arch`.include?('ppc') ? 'ppc' : %w{i386 x86_64}) { |x| x.split(',') }
end
+LLVM_CONFIG = do_option('llvm_config', '/usr/local/bin/llvm-config')
FRAMEWORK_NAME = do_option('framework_name', 'MacRuby')
FRAMEWORK_INSTDIR = do_option('framework_instdir', '/Library/Frameworks')
SYM_INSTDIR = do_option('sym_instdir', '/usr/local')
@@ -53,9 +54,8 @@
$stderr.puts "You appear to be using a PowerPC machine. MacRuby's primary architectures are Intel 32-bit and 64-bit (i386 and x86_64). Consequently, PowerPC support may be lacking some features."
end
-LLVM_CONFIG = `which llvm-config`.strip
-if LLVM_CONFIG.empty?
- $stderr.puts "The `llvm-config' executable was not located in your PATH. Please make sure LLVM is correctly installed on your machine or that your PATH is correctly set."
+unless File.exist?(LLVM_CONFIG)
+ $stderr.puts "The llvm-config executable was not located as #{LLVM_CONFIG}. Please make sure LLVM is correctly installed on your machine and pass the llvm_config option to rake if necessary."
exit 1
end
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20091130/5b7f20da/attachment.html>
More information about the macruby-changes
mailing list