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

ruby-changes:52738

From: k0kubun <ko1@a...>
Date: Mon, 8 Oct 2018 09:12:27 +0900 (JST)
Subject: [ruby-changes:52738] k0kubun:r64950 (trunk): revert r64947 and r64949

k0kubun	2018-10-08 09:12:21 +0900 (Mon, 08 Oct 2018)

  New Revision: 64950

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

  Log:
    revert r64947 and r64949
    
    Both didn't work well on mswin. Reverting.
    https://ci.appveyor.com/project/ruby/ruby/builds/19322867/job/28fgwiq8j7hdmeu6
    https://ci.appveyor.com/project/ruby/ruby/builds/19323721/job/1s73mrgu8n8wpa5f
    
    We need to revisit this to have MJIT header in a correct place, but
    having both in the place didn't make JIT on install directory functional
    either anyway...

  Modified files:
    trunk/win32/Makefile.sub
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 64949)
+++ win32/Makefile.sub	(revision 64950)
@@ -1299,9 +1299,6 @@ $(MJIT_PRECOMPILED_HEADER): $(MJIT_PRECO https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L1299
 	$(Q) $(MAKEDIRS) $(MJIT_HEADER_INSTALL_DIR)
 	$(Q) $(MAKE_LINK) $(MJIT_PRECOMPILED_HEADER_NAME) $@
 	$(Q) $(MAKE_LINK) $(MJIT_PRECOMPILED_HEADER_NAME:.pch=.)$(OBJEXT) $(MJIT_HEADER_INSTALL_DIR)/$(MJIT_PRECOMPILED_HEADER_NAME:.pch=.)$(OBJEXT)
-	$(Q) $(MAKEDIRS) $(prefix)/$(MJIT_HEADER_INSTALL_DIR)
-	$(Q) $(MAKE_LINK) $(MJIT_PRECOMPILED_HEADER_NAME) $(prefix)/$@
-	$(Q) $(MAKE_LINK) $(MJIT_PRECOMPILED_HEADER_NAME:.pch=.)$(OBJEXT) $(prefix)/$(MJIT_HEADER_INSTALL_DIR)/$(MJIT_PRECOMPILED_HEADER_NAME:.pch=.)$(OBJEXT)
 
 INSNS	= opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \
 	  vmtc.inc vm.inc mjit_compile.inc

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

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