From fc35612d1dba14b47dadfed1c354f4d20be63e03 Mon Sep 17 00:00:00 2001 From: Jake Farrell Date: Tue, 9 Oct 2012 00:30:03 +0000 Subject: [PATCH] Thrift-1673: Ruby compile flags for exension for multi arch builds (os x) 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 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/rb/ext/extconf.rb b/lib/rb/ext/extconf.rb index 90a06b64..ed20f561 100644 --- a/lib/rb/ext/extconf.rb +++ b/lib/rb/ext/extconf.rb @@ -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") -- 2.17.1