diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2021-12-04 16:20:30 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2021-12-04 16:20:30 +0900 |
| commit | 4a6ca12904c8160d68ac4b552636159926afff41 (patch) | |
| tree | 484643ddde3f26f754f16c1efe80885d45df8eef | |
| parent | a4964174e26303524cee8c2d8523048b87137993 (diff) | |
| download | ruby-4a6ca12904c8160d68ac4b552636159926afff41.tar.gz | |
Remove unversioned phony target for pkgconfig file [Bug #18374]
It results in a circular dependency when `--with-ruby-pc=ruby.pc`
is given. [ci skip]
| -rw-r--r-- | defs/gmake.mk | 2 | ||||
| -rw-r--r-- | template/Makefile.in | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/defs/gmake.mk b/defs/gmake.mk index 0b17bfb16f..dd7da5f770 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -424,3 +424,5 @@ endif spec/%/ spec/%_spec.rb: programs exts PHONY +$(RUNRUBY) -r./$(arch)-fake $(srcdir)/spec/mspec/bin/mspec-run -B $(srcdir)/spec/default.mspec $(SPECOPTS) $(patsubst %,$(srcdir)/%,$@) + +ruby.pc: $(filter-out ruby.pc,$(ruby_pc)) diff --git a/template/Makefile.in b/template/Makefile.in index 445f14ebdd..9e6d6fe0e3 100644 --- a/template/Makefile.in +++ b/template/Makefile.in @@ -318,7 +318,6 @@ $(LIBRUBY_$(LIBRUBY_WITH_EXT)): $(LIBRUBY_SO_UPDATE) PKG_CONFIG = @PKG_CONFIG@ ruby_pc = @ruby_pc@ -ruby.pc: $(ruby_pc) $(ruby_pc): config.status Makefile $(Q)./config.status --file=-:$(srcdir)/template/ruby.pc.in | \ sed -e 's/\$$(\([A-Za-z_][A-Za-z0-9_]*\))/$${\1}/g' \ |