Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure JAVA_SPEC_VERSION is defined for OMR compilation #2374

Merged
merged 1 commit into from
Jul 12, 2018
Merged

Ensure JAVA_SPEC_VERSION is defined for OMR compilation #2374

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions runtime/gc_glue_java/configure_includes/configure_common.mk.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down