summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2019-11-29 10:16:33 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2019-11-29 10:16:33 +0900
commit98006cea4fd517671dae508fade13203bc18301a (patch)
tree968141b773e8b64a03dc1538a1bebd7f03dfa41d
parent6b460a79489bf65dee0a4c9f42324d3836888dd3 (diff)
Add dependency on bundled yaml.h when using
-rw-r--r--ext/psych/depend2
-rw-r--r--ext/psych/extconf.rb5
2 files changed, 6 insertions, 1 deletions
diff --git a/ext/psych/depend b/ext/psych/depend
index 9f7d3a81da..dc358eaed3 100644
--- a/ext/psych/depend
+++ b/ext/psych/depend
@@ -1,3 +1,5 @@
+$(OBJS): $(YAML_H)
+
# AUTOGENERATED DEPENDENCIES START
psych.o: $(RUBY_EXTCONF_H)
psych.o: $(arch_hdrdir)/ruby/config.h
diff --git a/ext/psych/extconf.rb b/ext/psych/extconf.rb
index 00f9982704..a47e1dd518 100644
--- a/ext/psych/extconf.rb
+++ b/ext/psych/extconf.rb
@@ -32,8 +32,11 @@ if enable_config("bundled-libyaml", false) || !(find_header('yaml.h') && find_li
find_header 'yaml.h'
have_header 'config.h'
+ bundled = true
end
-create_makefile 'psych'
+create_makefile 'psych' do |mk|
+ mk << "YAML_H =#{' yaml/yaml.h' if bundled}\n"
+end
# :startdoc: