ruby-changes:36873
From: usa <ko1@a...>
Date: Wed, 24 Dec 2014 09:36:56 +0900 (JST)
Subject: [ruby-changes:36873] usa:r48954 (trunk): * ext/fiddle/extconf.rb: remove ffitarget.h generated by configure on
usa 2014-12-24 09:36:42 +0900 (Wed, 24 Dec 2014) New Revision: 48954 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=48954 Log: * ext/fiddle/extconf.rb: remove ffitarget.h generated by configure on mswin, because it's not normal file (cygwin's symlink) and have system attribute. Modified files: trunk/ChangeLog trunk/ext/fiddle/extconf.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 48953) +++ ChangeLog (revision 48954) @@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1 +Wed Dec 24 09:35:11 2014 NAKAMURA Usaku <usa@r...> + + * ext/fiddle/extconf.rb: remove ffitarget.h generated by configure on + mswin, because it's not normal file (cygwin's symlink) and have + system attribute. + Wed Dec 24 05:40:52 2014 NARUSE, Yui <naruse@r...> * tool/downloader.rb: support ruby 1.8. Index: ext/fiddle/extconf.rb =================================================================== --- ext/fiddle/extconf.rb (revision 48953) +++ ext/fiddle/extconf.rb (revision 48954) @@ -78,6 +78,9 @@ begin https://github.com/ruby/ruby/blob/trunk/ext/fiddle/extconf.rb#L78 system(*args, chdir: libffi.dir) or raise "failed to configure libffi. Please install libffi." end + if $mswin && File.file?("#{libffi.include}/ffitarget.h") + FileUtils.rm_f("#{libffi.include}/ffitarget.h") + end unless File.file?("#{libffi.include}/ffitarget.h") FileUtils.cp("#{srcdir}/src/x86/ffitarget.h", libffi.include, preserve: true) end -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/