kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

extconf.rb: libffi PIC objects

Browse source 
* ext/fiddle/extconf.rb: make PIC objects if it will be linked as
  a shared object eventually.  [ruby-core:67128]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49007 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-12-25 12:58:18 +00:00
parent 990a0bb897
commit a9f70432d4
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Thu Dec 25 21:58:15 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/fiddle/extconf.rb: make PIC objects if it will be linked as
a shared object eventually. [ruby-core:67128]
Thu Dec 25 19:01:13 2014 NAKAMURA Usaku <usa@ruby-lang.org> Thu Dec 25 19:01:13 2014 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/fiddle/win32/libffi-3.2.1-mswin.patch: support mswin32. * ext/fiddle/win32/libffi-3.2.1-mswin.patch: support mswin32.

5
ext/fiddle/extconf.rb
View file

@ -36,7 +36,7 @@ begin
end end
libffi.include = "#{libffi.builddir}/include" libffi.include = "#{libffi.builddir}/include"
libffi.lib = "#{libffi.builddir}/.libs" libffi.lib = "#{libffi.builddir}/.libs"
libffi.a = "#{libffi.lib}/libffi.#{$LIBEXT}" libffi.a = "#{libffi.lib}/libffi_convenience.#{$LIBEXT}"
nowarn = CONFIG.merge("warnflags"=>"") nowarn = CONFIG.merge("warnflags"=>"")
libffi.cflags = RbConfig.expand("$(CFLAGS)", nowarn) libffi.cflags = RbConfig.expand("$(CFLAGS)", nowarn)
ver = ver[/libffi-(.*)/, 1] ver = ver[/libffi-(.*)/, 1]
@ -64,9 +64,10 @@ begin
ld = RbConfig::CONFIG['LD'] ld = RbConfig::CONFIG['LD']
args.concat %W[ args.concat %W[
--srcdir=#{libffi.srcdir} --srcdir=#{libffi.srcdir}
--disable-shared --host=#{libffi.arch} --host=#{libffi.arch}
--enable-builddir=#{RUBY_PLATFORM} --enable-builddir=#{RUBY_PLATFORM}
] ]
args << ($enable_shared && !$static ? '--enable-shared' : '--enable-static')
args << libffi.opt if libffi.opt args << libffi.opt if libffi.opt
args.concat %W[ args.concat %W[
CC=#{cc} CFLAGS=#{libffi.cflags} CC=#{cc} CFLAGS=#{libffi.cflags}