Revision: 4314 http://trac.macosforge.org/projects/ruby/changeset/4314 Author: lsansonetti@apple.com Date: 2010-06-30 17:41:06 -0700 (Wed, 30 Jun 2010) Log Message: ----------- disable bridgesupport compilation unless --static is provided Modified Paths: -------------- MacRuby/trunk/bin/rubyc Modified: MacRuby/trunk/bin/rubyc =================================================================== --- MacRuby/trunk/bin/rubyc 2010-07-01 00:30:20 UTC (rev 4313) +++ MacRuby/trunk/bin/rubyc 2010-07-01 00:41:06 UTC (rev 4314) @@ -79,18 +79,21 @@ def run @uses_bs_flags = '' - @frameworks.each do |f| - p = - if File.exist?(f) - "#{f}/Resources/BridgeSupport/#{File.basename(f)}Full.bridgesupport" + if @static + # BridgeSupport compilation is only enabled during static compilation. + @frameworks.each do |f| + p = + if File.exist?(f) + "#{f}/Resources/BridgeSupport/#{File.basename(f)}Full.bridgesupport" + else + base = (@sdk || '') + File.join(base, "/System/Library/Frameworks/#{f}.framework/Resources/BridgeSupport/#{f}Full.bridgesupport") + end + if File.exist?(p) + @uses_bs_flags << "--uses-bs #{p} " else - base = (@sdk || '') - File.join(base, "/System/Library/Frameworks/#{f}.framework/Resources/BridgeSupport/#{f}Full.bridgesupport") + $stderr.puts "Couldn't locate the Full BridgeSupport file for framework `#{f}' at path `#{p}', compilation might generate a unusable binary!" end - if File.exist?(p) - @uses_bs_flags << "--uses-bs #{p} " - else - $stderr.puts "Couldn't locate the Full BridgeSupport file for framework `#{f}' at path `#{p}', compilation might generate a unusable binary!" end end if @dont_link or @bundle