nagachika	2014-06-02 02:07:21 +0900 (Mon, 02 Jun 2014)

  New Revision: 46303

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=46303

  Log:
    merge revision(s) r45365: [Backport #9656]
    
    dl/extconf.rb: check for -fno-defer-pop option
    
    * ext/dl/extconf.rb: check for -fno-defer-pop option, since clang
      5.1 no longer support -fno-defer-pop option.

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ext/dl/extconf.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/ext/dl/extconf.rb
===================================================================
--- ruby_2_1/ext/dl/extconf.rb	(revision 46302)
+++ ruby_2_1/ext/dl/extconf.rb	(revision 46303)
@@ -1,7 +1,12 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ext/dl/extconf.rb#L1
 require 'mkmf'
 
 if RbConfig::CONFIG['GCC'] == 'yes'
-  (have_macro("__clang__") ? $LDFLAGS : $CFLAGS) << " -fno-defer-pop"
+  flag = " -fno-defer-pop"
+  if have_macro("__clang__")
+    $LDFLAGS << flag if try_ldflags(flag)
+  else
+    $CFLAGS << flag
+  end
   $CFLAGS << " -fno-omit-frame-pointer"
 end
 
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 46302)
+++ ruby_2_1/version.h	(revision 46303)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.2"
 #define RUBY_RELEASE_DATE "2014-06-02"
-#define RUBY_PATCHLEVEL 119
+#define RUBY_PATCHLEVEL 120
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 6

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r45365


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/