Revision: 4148 http://trac.macosforge.org/projects/ruby/changeset/4148 Author: martinlagardette@apple.com Date: 2010-05-25 12:40:42 -0700 (Tue, 25 May 2010) Log Message: ----------- Make sure to honor the ARCHFLAGS env var in rbconfig.rb - Should fix #729 Modified Paths: -------------- MacRuby/trunk/rakelib/builder/templates.rb Modified: MacRuby/trunk/rakelib/builder/templates.rb =================================================================== --- MacRuby/trunk/rakelib/builder/templates.rb 2010-05-25 18:19:24 UTC (rev 4147) +++ MacRuby/trunk/rakelib/builder/templates.rb 2010-05-25 19:40:42 UTC (rev 4148) @@ -46,6 +46,14 @@ TOPDIR = File.dirname(__FILE__).chomp!("/lib/ruby/#{NEW_RUBY_VERSION}/#{NEW_RUBY_PLATFORM}") DESTDIR = '' unless defined? DESTDIR + ARCHFLAGS = + if e = ENV['ARCHFLAGS'] + e + elsif e = ENV['RC_ARCHS'] + e.split.map { |a| "-arch \#{a}" }.join(' ') + else + "#{ARCHFLAGS}" + end CONFIG = {} CONFIG["DESTDIR"] = DESTDIR CONFIG["INSTALL"] = '/usr/bin/install -c' @@ -105,12 +113,12 @@ CONFIG["target_vendor"] = "apple" CONFIG["target_os"] = "darwin9.0" CONFIG["CC"] = "/usr/bin/gcc" - CONFIG["CFLAGS"] = "-fexceptions -fno-common -pipe $(cflags)" - CONFIG["LDFLAGS"] = "" + CONFIG["CFLAGS"] = "$(ARCHFLAGS) -fexceptions -fno-common -pipe $(cflags)" + CONFIG["LDFLAGS"] = "$(ARCHFLAGS)" CONFIG["CPPFLAGS"] = "$(cppflags)" CONFIG["OBJEXT"] = "o" CONFIG["CXX"] = "/usr/bin/g++" - CONFIG["CXXFLAGS"] = "" + CONFIG["CXXFLAGS"] = "$(ARCHFLAGS)" CONFIG["CPP"] = "/usr/bin/gcc -E" CONFIG["GREP"] = "/usr/bin/grep" CONFIG["EGREP"] = "/usr/bin/grep -E" @@ -136,11 +144,11 @@ CONFIG["MAKEDIRS"] = "mkdir -p" CONFIG["ALLOCA"] = "" CONFIG["DLDFLAGS"] = "" - CONFIG["ARCH_FLAG"] = "#{ARCHFLAGS}" + 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" + CONFIG["LDSHARED"] = "$(CC) -dynamic -bundle -undefined suppress -flat_namespace $(ARCHFLAGS)" + CONFIG["LDSHAREDXX"] = "$(CXX) -dynamic -bundle -undefined suppress -flat_namespace $(ARCHFLAGS)" CONFIG["DLEXT"] = "bundle" CONFIG["DLEXT2"] = "" CONFIG["LIBEXT"] = "a" @@ -161,7 +169,7 @@ CONFIG["optflags"] = "-O3" CONFIG["debugflags"] = "-g" CONFIG["warnflags"] = "-Wall" - CONFIG["LIBRUBY_LDSHARED"] = "/usr/bin/gcc -dynamiclib -undefined suppress -flat_namespace" + CONFIG["LIBRUBY_LDSHARED"] = "/usr/bin/gcc -dynamiclib -undefined suppress -flat_namespace $(ARCHFLAGS)" 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"] = ""