aboutsummaryrefslogtreecommitdiffstats
path: root/common.mk
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-02-06 23:40:20 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-02-06 23:40:20 +0000
commitd3a76565dee7d091b5cffe4811833b310826c386 (patch)
treebc2c7db05ccf8de7d683114a712834a26595e10b /common.mk
parentf0137f05e11ff5abb69e7677c90c9c22d231a23c (diff)
downloadruby-d3a76565dee7d091b5cffe4811833b310826c386.tar.gz
common.mk: can't rescue NotImplementedError by default
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62269 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'common.mk')
-rw-r--r--common.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/common.mk b/common.mk
index 3dbd663db5..a3d1e7cb5c 100644
--- a/common.mk
+++ b/common.mk
@@ -213,8 +213,9 @@ $(MJIT_MIN_HEADER:.h=)$(MJIT_HEADER_SUFFIX).h: $(MJIT_HEADER:.h=)$(MJIT_HEADER_S
$(Q) $(MINIRUBY) -rfileutils -e "include FileUtils::Verbose" \
-e "src, dest = ARGV" \
-e "exit if File.identical?(src, dest) or cmp(src, dest) rescue nil" \
- -e "ln_sf('../'*dest.count('/')+src, dest) rescue" \
- -e "ln(src, dest) rescue" \
+ -e "def noraise; yield; rescue; rescue NotImplementedError; end" \
+ -e "noraise {ln_sf('../'*dest.count('/')+src, dest)} or" \
+ -e "noraise {ln(src, dest)} or" \
-e "cp(src, dest)" \
$@ $(MJIT_HEADER_INSTALL_DIR)/$(@F)