From b6ae93cd5014dc6a173ea76109e4e0970ea50067 Mon Sep 17 00:00:00 2001 From: "Keith W. Campbell" Date: Wed, 11 Jul 2018 21:06:16 -0400 Subject: [PATCH] Ensure JAVA_SPEC_VERSION is defined for OMR compilation Issue: #2373 Signed-off-by: Keith W. Campbell --- .../gc_glue_java/configure_includes/configure_common.mk.ftl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/runtime/gc_glue_java/configure_includes/configure_common.mk.ftl b/runtime/gc_glue_java/configure_includes/configure_common.mk.ftl index a7db6319d73..0eb5417b853 100644 --- a/runtime/gc_glue_java/configure_includes/configure_common.mk.ftl +++ b/runtime/gc_glue_java/configure_includes/configure_common.mk.ftl @@ -61,6 +61,11 @@ CONFIGURE_ARGS += 'exe_output_dir=$$(top_srcdir)/..' # J9 needs include to compile Windows .rc files generated by UMA, because the .rc file references include/j9cfg.h CONFIGURE_ARGS += 'GLOBAL_INCLUDES=$$(top_srcdir)/../include' +# OMR source files include j9cfg.h and so compiles must define JAVA_SPEC_VERSION. +CONFIGURE_ARGS += 'GLOBAL_CFLAGS=-DJAVA_SPEC_VERSION=$(VERSION_MAJOR)' +CONFIGURE_ARGS += 'GLOBAL_CPPFLAGS=-DJAVA_SPEC_VERSION=$(VERSION_MAJOR)' +CONFIGURE_ARGS += 'GLOBAL_CXXFLAGS=-DJAVA_SPEC_VERSION=$(VERSION_MAJOR)' + # This flag indicates that the J9 VMFarm build runs configure on a machine # that is not capable of compiling the source code. ifeq (yes,$(CALLED_BY_SOURCE_ZIP))