Skip to content

Commit

Permalink
Ensure JAVA_SPEC_VERSION is defined for OMR compilation
Browse files Browse the repository at this point in the history
Issue: eclipse-openj9#2373

Signed-off-by: Keith W. Campbell <[email protected]>
  • Loading branch information
keithc-ca committed Jul 12, 2018
1 parent f7532ad commit b6ae93c
Showing 1 changed file with 5 additions and 0 deletions.
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

0 comments on commit b6ae93c

Please sign in to comment.