summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authork0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-08-05 05:34:37 (GMT)
committerk0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-08-05 05:34:37 (GMT)
commit88975c821c99b852959958e2934de68a45be15e6 (patch)
tree4384d12ea863efc875166a0aca6cb21ebf69b985 /win32
parentd3e90363d36ec74ff97d2b17abbe1bf626c8deaf (diff)
mjit.c: link precompiled object
This is needed to resolve: "error LNK2011: precompiled object not linked in; image may not run" win32/Makefile.sub: Use the same flags as ones for precompiled header. This is needed to resolve: "error C2855: command-line option '/Z7' inconsistent with precompiled header" git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64192 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
-rw-r--r--win32/Makefile.sub6
1 files changed, 5 insertions, 1 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 862da1a..d07e843 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -316,9 +316,13 @@ MJIT_PRECOMPILED_HEADER = $(MJIT_HEADER_INSTALL_DIR)/$(MJIT_PRECOMPILED_HEADER_N
MJIT_CC = $(CC)
!endif
!ifndef MJIT_OPTFLAGS
-MJIT_OPTFLAGS = $(OPTFLAGS)
+# Short-term TODO: Include `$(XCFLAGS) $(CPPFLAGS)` to suppress warning. Currently adding them breakes JIT.
+# Long-term TODO: Use only $(OPTFLAGS) for performance. It requires to modify flags for precompiled header too.
+# Using flags used for building precompiled header to make JIT succeed.
+MJIT_OPTFLAGS = -DMJIT_HEADER $(CFLAGS)
!endif
!ifndef MJIT_DEBUGFLAGS
+# TODO: Make this work... Another header for debug build needs to be installed first.
MJIT_DEBUGFLAGS = $(DEBUGFLAGS)
!endif
!ifndef MJIT_LDSHARED