diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-08-31 05:27:44 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-08-31 05:27:44 +0000 |
commit | 2e42f37a020ce9c94f7d41e69b3e3ffec43a54ce (patch) | |
tree | e2b8bf02ebe6c8c00e7b11e4577c701d9b7c971f | |
parent | dde690bc32f4e7f614bf46edc3f8bce8ad2e131b (diff) | |
download | ruby-2e42f37a020ce9c94f7d41e69b3e3ffec43a54ce.tar.gz |
mkmf.rb: fix race conditions at install-ext
* lib/mkmf.rb (create_makefile): fix race conditions at install-ext.
target files need to depend on destination directory timestamp
files, not phony trgets.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36863 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | lib/mkmf.rb | 4 |
2 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Fri Aug 31 14:27:39 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/mkmf.rb (create_makefile): fix race conditions at install-ext. + target files need to depend on destination directory timestamp + files, not phony trgets. + Fri Aug 31 14:03:45 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> * vm_trace.c (clean_hooks): do not access freed memory. diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 367b344095..39113b5130 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -2152,8 +2152,8 @@ static: $(STATIC_LIB)#{$extout ? " install-rb" : ""} end for f in files dest = "#{dir}/#{File.basename(f)}" - mfile.print("install-rb#{sfx}: #{dest} #{timestamp_file(dir)}\n") - mfile.print("#{dest}: #{f}\n") + mfile.print("install-rb#{sfx}: #{dest}\n") + mfile.print("#{dest}: #{f} #{timestamp_file(dir)}\n") mfile.print("\t$(Q) $(#{$extout ? 'COPY' : 'INSTALL_DATA'}) #{f} $(@D#{sep})\n") if defined?($installed_list) and !$extout mfile.print("\t@echo #{dest}>>$(INSTALLED_LIST)\n") |