From 6e11415b9c3b2e36e91a5979249093426e3c6ad1 Mon Sep 17 00:00:00 2001
From: k0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 19 Oct 2018 12:31:02 +0000
Subject: configure.ac: add --disable-install-mjit-header

and substitute INSTALL_MJIT_HEADER. This would be convenient as a workaround
for user if we found a platform that can't compile Ruby after Ruby 2.6.0 release.

common.mk: Install MJIT header only when INSTALL_MJIT_HEADER
Makefile.in: ditto
win32/Makefile.sub: ditto

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65171 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 win32/Makefile.sub | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'win32')

diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 9a9e2b4724..f046d0bfcd 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -302,6 +302,9 @@ CPPFLAGS = $(DEFS) $(ARCHDEFS) $(CPPFLAGS)
 !if "$(USE_RUBYGEMS)" == "no"
 CPPFLAGS = -DDISABLE_RUBYGEMS $(CPPFLAGS)
 !endif
+!ifndef INSTALL_MJIT_HEADER
+INSTALL_MJIT_HEADER = yes
+!endif
 !if "$(CPPOUTFLAG)" == ">"
 MJIT_HEADER_FLAGS =
 !else
@@ -1271,8 +1274,8 @@ probes.h: {$(VPATH)}probes.dmyh
 #include "$(*F).dmyh"
 <<KEEP
 
-main: $(MJIT_PRECOMPILED_HEADER)
-mjit-headers: $(MJIT_PRECOMPILED_HEADER)
+main: mjit-headers
+yes-mjit-headers: $(MJIT_PRECOMPILED_HEADER)
 clean-local::
 	$(Q)$(RM) $(MJIT_PRECOMPILED_HEADER_NAME) $(MJIT_PRECOMPILED_HEADER_NAME:.pch=.)$(OBJEXT)
 	$(Q)$(RM) $(TIMESTAMPDIR)/$(MJIT_PRECOMPILED_HEADER_NAME:.pch=.time) mjit_config.h
-- 
cgit v1.2.3