aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-09-07 08:25:13 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-09-07 08:25:13 +0000
commit68b35a5dde919b4999fcdf49bdde46078feba56f (patch)
tree49e70169d4f09170d6c110116d65937c5f8cf2a9
parent82395e76484ded736a10c8085dd755606f350baf (diff)
downloadruby-68b35a5dde919b4999fcdf49bdde46078feba56f.tar.gz
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
-rw-r--r--common.mk6
1 files changed, 5 insertions, 1 deletions
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)