[macruby-changes] [1999] MacRuby/branches/experimental/rakelib/builder.rb

[source_changes at macosforge.org]

Revision: 1999
          http://trac.macosforge.org/projects/ruby/changeset/1999
Author:   pthomson at apple.com
Date:     2009-07-07 08:48:51 -0700 (Tue, 07 Jul 2009)
Log Message:
-----------
Removed support for building with Clang, as a clang-built executable does not pass the specs.

Modified Paths:
--------------
    MacRuby/branches/experimental/rakelib/builder.rb

Modified: MacRuby/branches/experimental/rakelib/builder.rb
===================================================================
--- MacRuby/branches/experimental/rakelib/builder.rb	2009-07-06 23:18:15 UTC (rev 1998)
+++ MacRuby/branches/experimental/rakelib/builder.rb	2009-07-07 15:48:51 UTC (rev 1999)
@@ -19,7 +19,6 @@
   end
 end
 
-USE_CLANG = do_option('use_clang', false)
 RUBY_INSTALL_NAME = do_option('ruby_install_name', 'macruby')
 RUBY_SO_NAME = do_option('ruby_so_name', RUBY_INSTALL_NAME)
 ARCHS = 
@@ -85,13 +84,9 @@
 INSTALL_NAME = File.join(FRAMEWORK_USR_LIB, 'lib' + RUBY_SO_NAME + '.dylib')
 ARCHFLAGS = ARCHS.map { |a| '-arch ' + a }.join(' ')
 LLVM_MODULES = "core jit nativecodegen interpreter bitwriter"
-if (USE_CLANG) and (`sw_vers -productVersion`.strip >= '10.6')
-  CC = '/usr/bin/clang'
-  CPP = '/usr/bin/llvm-g++-4.2'
-else
-  CC = '/usr/bin/gcc'
-  CPP = '/usr/bin/g++'
-end
+
+CC = '/usr/bin/gcc'
+CXX = '/usr/bin/g++'
 CFLAGS = "-I. -I./include -I./onig -I/usr/include/libxml2 #{ARCHFLAGS} -fno-common -pipe -O3 -g -Wall -fexceptions"
 CFLAGS << " -Wno-parentheses -Wno-deprecated-declarations -Werror" if NO_WARN_BUILD
 OBJC_CFLAGS = CFLAGS + " -fobjc-gc-only"
@@ -139,7 +134,7 @@
         cc, flags = 
           case File.extname(s)
             when '.c' then [CC, @cflags]
-            when '.cpp' then [CPP, @cxxflags]
+            when '.cpp' then [CXX, @cxxflags]
             when '.m' then [CC, @objc_cflags]
           end
         sh("#{cc} #{flags} -c #{s} -o #{obj}.o")
@@ -174,7 +169,7 @@
     objs ||= @objs
     ldflags ||= @ldflags
     if should_link?(name, objs)
-      sh("#{CPP} #{@cflags} #{objs.map { |x| x + '.o' }.join(' ') } #{ldflags} #{args}")
+      sh("#{CXX} #{@cflags} #{objs.map { |x| x + '.o' }.join(' ') } #{ldflags} #{args}")
     end
   end
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20090707/cb703c11/attachment.html>