[macruby-changes] [4193] MacRuby/trunk

[source_changes at macosforge.org]

Revision: 4193
          http://trac.macosforge.org/projects/ruby/changeset/4193
Author:   lsansonetti at apple.com
Date:     2010-06-01 22:05:49 -0700 (Tue, 01 Jun 2010)
Log Message:
-----------
make sure ARCHFLAGS is properly expanded

Modified Paths:
--------------
    MacRuby/trunk/lib/mkmf.rb
    MacRuby/trunk/rakelib/builder/templates.rb

Modified: MacRuby/trunk/lib/mkmf.rb
===================================================================
--- MacRuby/trunk/lib/mkmf.rb	2010-06-02 04:29:32 UTC (rev 4192)
+++ MacRuby/trunk/lib/mkmf.rb	2010-06-02 05:05:49 UTC (rev 4193)
@@ -405,7 +405,7 @@
                                 'arch_hdrdir' => "#$arch_hdrdir",
                                 'top_srcdir' => $top_srcdir.quote)
   RbConfig::expand("$(CPP) #$INCFLAGS #$CPPFLAGS #$CFLAGS #{opt} #{CONFTEST_C} #{outfile}",
-		   conf)
+		   conf).gsub(/-arch\s+[^\s]+/, '')
 end
 
 def libpathflag(libpath=$DEFLIBPATH|$LIBPATH)

Modified: MacRuby/trunk/rakelib/builder/templates.rb
===================================================================
--- MacRuby/trunk/rakelib/builder/templates.rb	2010-06-02 04:29:32 UTC (rev 4192)
+++ MacRuby/trunk/rakelib/builder/templates.rb	2010-06-02 05:05:49 UTC (rev 4193)
@@ -48,7 +48,7 @@
   DESTDIR = '' unless defined? DESTDIR
   ARCHFLAGS = 
     if e = ENV['ARCHFLAGS']
-      e
+      e.dup
     elsif e = ENV['RC_ARCHS']
       e.split.map { |a| "-arch \#{a}" }.join(' ')
     else
@@ -113,12 +113,12 @@
   CONFIG["target_vendor"] = "apple"
   CONFIG["target_os"] = "darwin9.0"
   CONFIG["CC"] = "/usr/bin/gcc"
-  CONFIG["CFLAGS"] = "$(ARCHFLAGS) -fexceptions -fno-common -pipe $(cflags)"
-  CONFIG["LDFLAGS"] = "$(ARCHFLAGS)"
+  CONFIG["CFLAGS"] = "$(ARCH_FLAG) -fexceptions -fno-common -pipe $(cflags)"
+  CONFIG["LDFLAGS"] = "$(ARCH_FLAG)"
   CONFIG["CPPFLAGS"] = "$(cppflags)"
   CONFIG["OBJEXT"] = "o"
   CONFIG["CXX"] = "/usr/bin/g++"
-  CONFIG["CXXFLAGS"] = "$(ARCHFLAGS)"
+  CONFIG["CXXFLAGS"] = "$(ARCH_FLAG)"
   CONFIG["CPP"] = "/usr/bin/gcc -E"
   CONFIG["GREP"] = "/usr/bin/grep"
   CONFIG["EGREP"] = "/usr/bin/grep -E"
@@ -147,8 +147,8 @@
   CONFIG["ARCH_FLAG"] = ARCHFLAGS
   CONFIG["STATIC"] = ""
   CONFIG["CCDLFLAGS"] = "-fno-common"
-  CONFIG["LDSHARED"] = "$(CC) -dynamic -bundle -undefined suppress -flat_namespace $(ARCHFLAGS)"
-  CONFIG["LDSHAREDXX"] = "$(CXX) -dynamic -bundle -undefined suppress -flat_namespace $(ARCHFLAGS)"
+  CONFIG["LDSHARED"] = "$(CC) -dynamic -bundle -undefined suppress -flat_namespace $(ARCH_FLAG)"
+  CONFIG["LDSHAREDXX"] = "$(CXX) -dynamic -bundle -undefined suppress -flat_namespace $(ARCH_FLAG)"
   CONFIG["DLEXT"] = "bundle"
   CONFIG["DLEXT2"] = ""
   CONFIG["LIBEXT"] = "a"
@@ -169,7 +169,7 @@
   CONFIG["optflags"] = "-O3"
   CONFIG["debugflags"] = "-g"
   CONFIG["warnflags"] = "-Wall"
-  CONFIG["LIBRUBY_LDSHARED"] = "/usr/bin/gcc -dynamiclib -undefined suppress -flat_namespace $(ARCHFLAGS)"
+  CONFIG["LIBRUBY_LDSHARED"] = "/usr/bin/gcc -dynamiclib -undefined suppress -flat_namespace $(ARCH_FLAG)"
   CONFIG["LIBRUBY_DLDFLAGS"] = "-install_name $(libdir)/lib$(RUBY_SO_NAME).dylib -current_version $(MAJOR).$(MINOR).$(TEENY) -compatibility_version $(MAJOR).$(MINOR)"
   CONFIG["rubyw_install_name"] = ""
   CONFIG["RUBYW_INSTALL_NAME"] = ""
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20100601/24af982a/attachment-0001.html>