From 99d989be9e3e2d2031c43ca865e096dbdbf0b9d9 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 7 Sep 2017 08:25:13 +0000 Subject: [PATCH] common.mk: fix golf * common.mk (golf): MAINOBJ must be single object file name, so moved golf_prelude to EXTOBJS. [ruby-dev:50214] [Bug #13854] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59767 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- common.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/common.mk b/common.mk index 7e414f794e..9d5448fc49 100644 --- a/common.mk +++ b/common.mk @@ -252,7 +252,11 @@ objs: $(ALLOBJS) GORUBY = go$(RUBY_INSTALL_NAME) golf: $(LIBRUBY) $(GOLFOBJS) PHONY - $(Q) $(MAKE) $(mflags) MAINOBJ="$(GOLFOBJS)" PROGRAM=$(GORUBY)$(EXEEXT) program + $(Q) $(MAKE) $(mflags) \ + MAINOBJ=goruby.$(OBJEXT) \ + EXTOBJS="golf_prelude.$(OBJEXT) $(EXTOBJS)" \ + PROGRAM=$(GORUBY)$(EXEEXT) \ + program capi: $(CAPIOUT)/.timestamp PHONY $(CAPIOUT)/.timestamp: Doxyfile $(PREP)