nobu	2018-06-17 11:40:32 +0900 (Sun, 17 Jun 2018)

  New Revision: 63679

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=63679

  Log:
    Makefile.in: MJIT_DLDFLAGS
    
    * Makefile.in (mjit_config.h): needs -arch flag to link, as well
      as precompiling the header, when compiling for i386 on x86_64
      mac.

  Modified files:
    trunk/Makefile.in
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 63678)
+++ Makefile.in	(revision 63679)
@@ -81,6 +81,7 @@ MJIT_CC = @MJIT_CC@ https://github.com/ruby/ruby/blob/trunk/Makefile.in#L81
 MJIT_OPTFLAGS = @MJIT_OPTFLAGS@
 MJIT_DEBUGFLAGS = @MJIT_DEBUGFLAGS@
 MJIT_LDSHARED = @MJIT_LDSHARED@
+MJIT_DLDFLAGS = @DLDFLAGS@
 LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@
 EXTLDFLAGS = @EXTLDFLAGS@
 XLDFLAGS = @XLDFLAGS@ $(EXTLDFLAGS)
@@ -558,6 +559,7 @@ mjit_config.h: https://github.com/ruby/ruby/blob/trunk/Makefile.in#L559
 	    echo; \
 	}; \
 	archs="$(UNIVERSAL_ARCHNAMES)"; \
+	archs="$${archs:-$(ARCH_FLAG:-arch=)}"; \
 	test "$(Q)" = @ || set -x; \
 	echo '#ifndef RUBY_MJIT_CONFIG_H'; \
 	echo '#define RUBY_MJIT_CONFIG_H 1'; \
@@ -570,7 +572,7 @@ mjit_config.h: https://github.com/ruby/ruby/blob/trunk/Makefile.in#L572
 	quote "MJIT_OPTFLAGS   " $(MJIT_OPTFLAGS); \
 	quote "MJIT_DEBUGFLAGS " $(MJIT_DEBUGFLAGS); \
 	quote "MJIT_LDSHARED   " $(MJIT_LDSHARED); \
-	quote "MJIT_DLDFLAGS   " @DLDFLAGS@; \
+	quote "MJIT_DLDFLAGS   $${archs:+ MJIT_ARCHFLAG}" $(MJIT_DLDFLAGS); \
 	quote "MJIT_LIBS       " $(LIBRUBYARG_SHARED); \
 	$${archs:+echo} $${archs:+'#if 0'}; \
 	for arch in $$archs; do \

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/