Thrift-1673: Ruby compile flags for exension for multi arch builds (os x)
authorJake Farrell <jfarrell@apache.org>
Tue, 9 Oct 2012 00:30:03 +0000 (00:30 +0000)
committerJake Farrell <jfarrell@apache.org>
Tue, 9 Oct 2012 00:30:03 +0000 (00:30 +0000)
Client: rb
Patch: Jake Farrell

Updating extconf to only grab arch flags from ruby binary to stop rvm version >= 1.9.x from breaking.

git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1395824 13f79535-47bb-0310-9956-ffa450edef68

lib/rb/ext/extconf.rb

index 90a06b6..ed20f56 100644 (file)
@@ -22,7 +22,9 @@ if defined?(RUBY_ENGINE) && RUBY_ENGINE =~ /jruby/
 else
   require 'mkmf'
 
-  $CFLAGS = "-g -O2 -Wall -Werror " + Config::CONFIG["CFLAGS"]
+  $ARCH_FLAGS = Config::CONFIG['CFLAGS'].scan( /(-arch )(\S+)/ ).map{|x,y| x + y + ' ' }.join('')
+
+  $CFLAGS = "-g -O2 -Wall -Werror " + $ARCH_FLAGS
 
   have_func("strlcpy", "string.h")