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

ruby-changes:68612

From: Alan <ko1@a...>
Date: Thu, 21 Oct 2021 08:10:42 +0900 (JST)
Subject: [ruby-changes:68612] 7e400ddc79 (master): Try to fix Windows build

https://git.ruby-lang.org/ruby.git/commit/?id=7e400ddc79

From 7e400ddc791fc4111cbfb273574657c41ca5b22e Mon Sep 17 00:00:00 2001
From: Alan Wu <XrXr@u...>
Date: Mon, 5 Oct 2020 11:45:08 -0400
Subject: Try to fix Windows build

---
 ujit_compile.c     | 2 +-
 win32/Makefile.sub | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ujit_compile.c b/ujit_compile.c
index 5c2e05f84d..8a9d196b3b 100644
--- a/ujit_compile.c
+++ b/ujit_compile.c
@@ -512,7 +512,7 @@ rb_ujit_enabled_p(void) https://github.com/ruby/ruby/blob/trunk/ujit_compile.c#L512
 void
 rb_ujit_init(void)
 {
-    if (!ujit_scrape_successful && PLATFORM_SUPPORTED_P) {
+    if (!ujit_scrape_successful || !PLATFORM_SUPPORTED_P) {
         return;
     }
     // Initialize the code blocks
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 2aef63985b..0dd62993e6 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -1347,7 +1347,7 @@ $(MJIT_PRECOMPILED_HEADER): $(MJIT_PRECOMPILED_HEADER_NAME) https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L1347
 	$(Q) $(MAKE_LINK) $(MJIT_PRECOMPILED_HEADER_NAME:.pch=.pdb) $(arch_hdrdir)/$(MJIT_PRECOMPILED_HEADER_NAME:.pch=.pdb)
 
 INSNS	= opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \
-	  vmtc.inc vm.inc mjit_compile.inc
+	  vmtc.inc vm.inc mjit_compile.inc ujit_examples.inc
 
 !if [exit > insns_rules.mk]
 !else if [for %I in ($(INSNS)) do \
-- 
cgit v1.2.1


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

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