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

ruby-changes:53352

From: nobu <ko1@a...>
Date: Tue, 6 Nov 2018 16:03:28 +0900 (JST)
Subject: [ruby-changes:53352] nobu:r65568 (trunk): Makefile.in: convert MJIT_CC to Windows path

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

  New Revision: 65568

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

  Log:
    Makefile.in: convert MJIT_CC to Windows path
    
    * Makefile.in (mjit_config.h): convert MJIT_CC to Windows path on
      mingw.

  Modified files:
    trunk/Makefile.in
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 65567)
+++ Makefile.in	(revision 65568)
@@ -598,6 +598,8 @@ 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; \
 	test "$(Q)" = @ || set -x; \
 	archs="$(UNIVERSAL_ARCHNAMES)"; \
 	arch_flag=""; \
@@ -610,7 +612,7 @@ mjit_config.h: https://github.com/ruby/ruby/blob/trunk/Makefile.in#L612
 	quote MJIT_BUILD_DIR "`$(CHDIR) . && pwd`"; \
 	quote MJIT_MIN_HEADER_NAME "/$(MJIT_HEADER_INSTALL_DIR)/$(MJIT_MIN_HEADER_NAME)"; \
 	sep=,; \
-	quote "MJIT_CC_COMMON  " "`command -v $(MJIT_CC)`"; \
+	quote "MJIT_CC_COMMON  " "$${mjit_cc}"; \
 	quote "MJIT_CFLAGS     $${need_mjit_archflag:+ MJIT_ARCHFLAG}" $(MJIT_CFLAGS); \
 	quote "MJIT_OPTFLAGS   " $(MJIT_OPTFLAGS); \
 	quote "MJIT_DEBUGFLAGS " $(MJIT_DEBUGFLAGS); \

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

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