ruby-changes:66673
From: Nobuyoshi <ko1@a...>
Date: Sat, 3 Jul 2021 23:32:17 +0900 (JST)
Subject: [ruby-changes:66673] ac6924e10e (master): goruby.c: include golf_prelude.c to get rid of overwriting EXTOBJS
https://git.ruby-lang.org/ruby.git/commit/?id=ac6924e10e From ac6924e10eed6a0747ed61f53d793b2611a5f72f Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada <nobu@r...> Date: Sat, 3 Jul 2021 22:39:14 +0900 Subject: goruby.c: include golf_prelude.c to get rid of overwriting EXTOBJS --- common.mk | 211 ++++++++------------------------------------------------------ goruby.c | 6 +- 2 files changed, 31 insertions(+), 186 deletions(-) diff --git a/common.mk b/common.mk index e1457d7..4eaae1e 100644 --- a/common.mk +++ b/common.mk @@ -164,7 +164,7 @@ EXPORTOBJS = $(DLNOBJ) \ https://github.com/ruby/ruby/blob/trunk/common.mk#L164 OBJS = $(EXPORTOBJS) builtin.$(OBJEXT) ALLOBJS = $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(INITOBJS) -GOLFOBJS = goruby.$(OBJEXT) golf_prelude.$(OBJEXT) +GOLFOBJS = goruby.$(OBJEXT) DEFAULT_PRELUDES = $(GEM_PRELUDE) PRELUDE_SCRIPTS = $(DEFAULT_PRELUDES) @@ -326,7 +326,6 @@ $(GOLF): $(LIBRUBY) $(GOLFOBJS) PHONY https://github.com/ruby/ruby/blob/trunk/common.mk#L326 $(Q) $(MAKE) $(mflags) \ GOLF=_dummy_golf_target_to_avoid_conflict_just_in_case_ \ MAINOBJ=goruby.$(OBJEXT) \ - EXTOBJS="golf_prelude.$(OBJEXT) $(EXTOBJS)" \ PROGRAM=$(GORUBY)$(EXEEXT) \ V=$(V) \ program @@ -5844,192 +5843,22 @@ gc.$(OBJEXT): {$(VPATH)}vm_core.h https://github.com/ruby/ruby/blob/trunk/common.mk#L5843 gc.$(OBJEXT): {$(VPATH)}vm_debug.h gc.$(OBJEXT): {$(VPATH)}vm_opts.h gc.$(OBJEXT): {$(VPATH)}vm_sync.h -golf_prelude.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h -golf_prelude.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h -golf_prelude.$(OBJEXT): $(CCAN_DIR)/list/list.h -golf_prelude.$(OBJEXT): $(CCAN_DIR)/str/str.h -golf_prelude.$(OBJEXT): $(hdrdir)/ruby.h -golf_prelude.$(OBJEXT): $(hdrdir)/ruby/ruby.h -golf_prelude.$(OBJEXT): $(top_srcdir)/internal/array.h -golf_prelude.$(OBJEXT): $(top_srcdir)/internal/compilers.h -golf_prelude.$(OBJEXT): $(top_srcdir)/internal/gc.h -golf_prelude.$(OBJEXT): $(top_srcdir)/internal/imemo.h -golf_prelude.$(OBJEXT): $(top_srcdir)/internal/serial.h -golf_prelude.$(OBJEXT): $(top_srcdir)/internal/static_assert.h -golf_prelude.$(OBJEXT): $(top_srcdir)/internal/vm.h -golf_prelude.$(OBJEXT): $(top_srcdir)/internal/warnings.h -golf_prelude.$(OBJEXT): {$(VPATH)}assert.h -golf_prelude.$(OBJEXT): {$(VPATH)}atomic.h -golf_prelude.$(OBJEXT): {$(VPATH)}backward/2/assume.h -golf_prelude.$(OBJEXT): {$(VPATH)}backward/2/attributes.h -golf_prelude.$(OBJEXT): {$(VPATH)}backward/2/bool.h -golf_prelude.$(OBJEXT): {$(VPATH)}backward/2/gcc_version_since.h -golf_prelude.$(OBJEXT): {$(VPATH)}backward/2/inttypes.h -golf_prelude.$(OBJEXT): {$(VPATH)}backward/2/limits.h -golf_prelude.$(OBJEXT): {$(VPATH)}backward/2/long_long.h -golf_prelude.$(OBJEXT): {$(VPATH)}backward/2/stdalign.h -golf_prelude.$(OBJEXT): {$(VPATH)}backward/2/stdarg.h -golf_prelude.$(OBJEXT): {$(VPATH)}config.h -golf_prelude.$(OBJEXT): {$(VPATH)}defines.h -golf_prelude.$(OBJEXT): {$(VPATH)}golf_prelude.c -golf_prelude.$(OBJEXT): {$(VPATH)}golf_prelude.rb -golf_prelude.$(OBJEXT): {$(VPATH)}id.h -golf_prelude.$(OBJEXT): {$(VPATH)}intern.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/anyargs.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/arithmetic.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/arithmetic/char.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/arithmetic/double.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/arithmetic/fixnum.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/arithmetic/gid_t.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/arithmetic/int.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/arithmetic/intptr_t.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/arithmetic/long.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/arithmetic/long_long.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/arithmetic/mode_t.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/arithmetic/off_t.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/arithmetic/pid_t.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/arithmetic/short.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/arithmetic/size_t.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/arithmetic/st_data_t.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/arithmetic/uid_t.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/assume.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/alloc_size.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/artificial.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/cold.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/const.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/constexpr.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/deprecated.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/diagnose_if.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/enum_extensibility.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/error.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/flag_enum.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/forceinline.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/format.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/maybe_unused.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/noalias.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/nodiscard.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/noexcept.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/noinline.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/nonnull.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/noreturn.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/pure.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/restrict.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/returns_nonnull.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/warning.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/attr/weakref.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/cast.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/compiler_is.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/compiler_is/apple.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/compiler_is/clang.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/compiler_is/gcc.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/compiler_is/intel.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/compiler_is/msvc.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/compiler_is/sunpro.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/compiler_since.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/config.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/constant_p.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/core.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/core/rarray.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/core/rbasic.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/core/rbignum.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/core/rclass.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/core/rdata.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/core/rfile.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/core/rhash.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/core/robject.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/core/rregexp.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/core/rstring.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/core/rstruct.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/core/rtypeddata.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/ctype.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/dllexport.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/dosish.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/error.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/eval.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/event.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/fl_type.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/gc.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/glob.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/globals.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/has/attribute.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/has/builtin.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/has/c_attribute.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/has/cpp_attribute.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/has/declspec_attribute.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/has/extension.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/has/feature.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/has/warning.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/array.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/bignum.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/class.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/compar.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/complex.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/cont.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/dir.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/enum.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/enumerator.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/error.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/eval.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/file.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/gc.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/hash.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/io.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/load.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/marshal.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/numeric.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/object.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/parse.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/proc.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/process.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/random.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/range.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/rational.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/re.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/ruby.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/select.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/select/largesize.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/signal.h -golf_prelude.$(OBJEXT): {$(VPATH)}internal/intern/sprintf.h -golf_prelude.$(OBJEXT): {$ (... truncated) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/