diff --git a/ChangeLog b/ChangeLog index d92c88c32a..1a14d1377b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Dec 24 09:35:11 2014 NAKAMURA Usaku + + * 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 * tool/downloader.rb: support ruby 1.8. diff --git a/ext/fiddle/extconf.rb b/ext/fiddle/extconf.rb index 3b885d2ff0..ca5fc35496 100644 --- a/ext/fiddle/extconf.rb +++ b/ext/fiddle/extconf.rb @@ -78,6 +78,9 @@ begin 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