[前][次][番号順一覧][スレッド一覧]

ruby-changes:53354

From: nobu <ko1@a...>
Date: Tue, 6 Nov 2018 16:28:15 +0900 (JST)
Subject: [ruby-changes:53354] nobu:r65570 (trunk): Makefile.in: do not expand MJIT_CC if cross compiling

nobu	2018-11-06 16:28:11 +0900 (Tue, 06 Nov 2018)

  New Revision: 65570

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

  Log:
    Makefile.in: do not expand MJIT_CC if cross compiling
    
    * Makefile.in (mjit_config.h): expand MJIT_CC only if native
      build, the path on cross compiling host is useless.

  Modified files:
    trunk/Makefile.in
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 65569)
+++ Makefile.in	(revision 65570)
@@ -598,8 +598,11 @@ mjit_config.h: https://github.com/ruby/ruby/blob/trunk/Makefile.in#L598
 	        esac; \
 	    done; \
 	}; \
-	mjit_cc=`command -v $(MJIT_CC)`; \
-	case $(arch) in *-mingw*) mjit_cc="`cygpath -m $$mjit_cc`";; esac; \
+	mjit_cc="$(MJIT_CC)"; \
+	if [ "$(CROSS_COMPILING)" = no ]; then \
+	    mjit_cc="`command -v $$mjit_cc`"; \
+	    case $(arch) in *-mingw*) mjit_cc="`cygpath -m $$mjit_cc`";; esac; \
+	fi; \
 	test "$(Q)" = @ || set -x; \
 	archs="$(UNIVERSAL_ARCHNAMES)"; \
 	arch_flag=""; \

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

[前][次][番号順一覧][スレッド一覧]