зеркало из https://github.com/github/ruby.git
* ext/psych/extconf.rb: copy sources into build directory,
not into srcdir. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37923 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
835d24f637
Коммит
1ff0a3d0c6
|
@ -1,3 +1,8 @@
|
|||
Wed Nov 28 14:50:55 2012 Koichi Sasada <ko1@atdot.net>
|
||||
|
||||
* ext/psych/extconf.rb: copy sources into build directory,
|
||||
not into srcdir.
|
||||
|
||||
Wed Nov 28 14:34:06 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
|
||||
|
||||
* thread.c (rb_mutex_lock): moved trap context check from
|
||||
|
|
|
@ -11,11 +11,16 @@ unless find_header('yaml.h') && find_library('yaml', 'yaml_get_version')
|
|||
srcdir = File.expand_path File.dirname __FILE__
|
||||
files = Dir.chdir File.join(srcdir, 'yaml') do
|
||||
Dir.entries(Dir.pwd).find_all { |f|
|
||||
File.file?(f) && File.extname(f) =~ /^\.[hc]/
|
||||
File.file?(f) && /^\.[hc]/ =~ File.extname(f)
|
||||
}.map { |f| File.expand_path f }
|
||||
end
|
||||
|
||||
FileUtils.cp_r files, srcdir
|
||||
dstdir = Dir.pwd
|
||||
FileUtils.cp_r files, dstdir
|
||||
|
||||
$objs = (Dir.glob(File.join(File.dirname(__FILE__), '*.c')) + Dir.glob('*.c')).map{|f|
|
||||
File.basename(f, '.c') + ".#{$OBJEXT}"
|
||||
}
|
||||
|
||||
if $mswin
|
||||
$CFLAGS += " -DYAML_DECLARE_STATIC -DHAVE_CONFIG_H"
|
||||
|
|
Загрузка…
Ссылка в новой задаче