ruby-changes:63686
From: Nobuyoshi <ko1@a...>
Date: Sun, 22 Nov 2020 19:12:12 +0900 (JST)
Subject: [ruby-changes:63686] 75d48a533d (master): rubyspec-capiext: Use plain DLDFLAGS without flags for libruby
https://git.ruby-lang.org/ruby.git/commit/?id=75d48a533d From 75d48a533d01eeb1bb5e6761484a4dece9408fc1 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada <nobu@r...> Date: Sun, 22 Nov 2020 19:09:58 +0900 Subject: rubyspec-capiext: Use plain DLDFLAGS without flags for libruby diff --git a/defs/gmake.mk b/defs/gmake.mk index ec9575a..a6d5617 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -386,10 +386,11 @@ update-deps: https://github.com/ruby/ruby/blob/trunk/defs/gmake.mk#L386 # order-only-prerequisites doesn't work for $(RUBYSPEC_CAPIEXT) # because the same named directory exists in the source tree. -$(RUBYSPEC_CAPIEXT)/%.$(DLEXT): $(srcdir)/$(RUBYSPEC_CAPIEXT)/%.c $(srcdir)/$(RUBYSPEC_CAPIEXT)/rubyspec.h $(RUBY_H_INCLUDES) +$(RUBYSPEC_CAPIEXT)/%.$(DLEXT): $(srcdir)/$(RUBYSPEC_CAPIEXT)/%.c $(srcdir)/$(RUBYSPEC_CAPIEXT)/rubyspec.h $(RUBY_H_INCLUDES) $(LIBRUBY_SO) $(ECHO) building $@ $(Q) $(MAKEDIRS) $(@D) - $(Q) $(DLDSHARED) $(DLDFLAGS) $(ARCH_FLAG) $(CFLAGS) $(INCFLAGS) $(CPPFLAGS) $(OUTFLAG)$@ $< + $(Q) $(DLDSHARED) $(XDLDFLAGS) $(XLDFLAGS) $(ARCH_FLAG) $(ARCH_FLAG) $(CFLAGS) $(INCFLAGS) $(CPPFLAGS) $(OUTFLAG)$@ $< $(LIBRUBY_SO) $(Q) $(RMALL) $@.* + rubyspec-capiext: $(patsubst %.c,$(RUBYSPEC_CAPIEXT)/%.$(DLEXT),$(notdir $(wildcard $(srcdir)/$(RUBYSPEC_CAPIEXT)/*.c))) @ $(NULLCMD) diff --git a/template/Makefile.in b/template/Makefile.in index 08e47e7..f5a3149 100644 --- a/template/Makefile.in +++ b/template/Makefile.in @@ -98,7 +98,7 @@ MJIT_CFLAGS = @MJIT_CFLAGS@ https://github.com/ruby/ruby/blob/trunk/template/Makefile.in#L98 MJIT_OPTFLAGS = @MJIT_OPTFLAGS@ MJIT_DEBUGFLAGS = @MJIT_DEBUGFLAGS@ MJIT_LDSHARED = @MJIT_LDSHARED@ -MJIT_DLDFLAGS = @DLDFLAGS@ +MJIT_DLDFLAGS = $(XDLDFLAGS) MJIT_HEADER = rb_mjit_header.h MJIT_MIN_HEADER_NAME = rb_mjit_min_header-$(RUBY_PROGRAM_VERSION).h MJIT_MIN_HEADER = $(MJIT_HEADER_BUILD_DIR)/$(MJIT_MIN_HEADER_NAME) @@ -113,6 +113,7 @@ MISSING = @LIBOBJS@ @ALLOCA@ https://github.com/ruby/ruby/blob/trunk/template/Makefile.in#L113 ENABLE_SHARED = @ENABLE_SHARED@ LDSHARED = @LIBRUBY_LDSHARED@ DLDSHARED = @DLDSHARED@ +XDLDFLAGS = @DLDFLAGS@ DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(XLDFLAGS) $(ARCH_FLAG) SOLIBS = @SOLIBS@ ENABLE_DEBUG_ENV = @ENABLE_DEBUG_ENV@ -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/