Skip to content

Commit 0b5fbbd

Browse files
j9buildj9build
committed
Merging latest openj9 into openj9-staging
2 parents 43af095 + 289ae44 commit 0b5fbbd

File tree

8 files changed

+147
-141
lines changed

8 files changed

+147
-141
lines changed

‎closed/OpenJ9.gmk

+35-23
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ ifeq (,$(BUILD_ID))
3030
BUILD_ID := 000000
3131
endif
3232

33+
OPENJDK_SHA := $(shell git -C $(TOPDIR) rev-parse --short HEAD)
34+
ifeq (,$(OPENJDK_SHA))
35+
$(error Could not determine OpenJDK SHA)
36+
endif
37+
3338
OPENJ9_SHA := $(shell git -C $(OPENJ9_TOPDIR) rev-parse --short HEAD)
3439
ifeq (,$(OPENJ9_SHA))
3540
$(error Could not determine OpenJ9 SHA)
@@ -52,8 +57,12 @@ ifeq (,$(OPENJ9OMR_SHA))
5257
$(error Could not determine OMR SHA)
5358
endif
5459

55-
# openjdk makeflags don't work with openj9/omr native compiles; override with number of CPUs which openj9 and omr need supplied
56-
override MAKEFLAGS := -j $(JOBS)
60+
# openjdk makeflags don't work with openj9/omr native compiles
61+
override MAKEFLAGS :=
62+
# specify desired parallelism
63+
ifneq (,$(JOBS))
64+
MAKE_ARGS += -j $(JOBS)
65+
endif
5766

5867
ifeq (windows,$(OPENJDK_TARGET_OS))
5968
# convert unix path to windows path
@@ -67,7 +76,6 @@ endif
6776

6877
.PHONY : \
6978
build-j9vm \
70-
build-openj9-tools \
7179
generate-j9jcl-sources \
7280
generate-j9-version-headers \
7381
run-preprocessors-j9 \
@@ -140,6 +148,9 @@ else
140148
FEATURE_SED_SCRIPT += $(call SedDisable,opt_jitserver)
141149
endif
142150

151+
# Disable windows rebase.
152+
SPEC_SED_SCRIPT += $(call SedDisable,uma_windowsRebase)
153+
143154
# Adjust OpenJDK MethodHandles enablement flags.
144155
ifeq (true,$(OPENJ9_ENABLE_OPENJDK_METHODHANDLES))
145156
FEATURE_SED_SCRIPT += $(call SedEnable,opt_openjdkMethodhandle)
@@ -170,16 +181,6 @@ $(foreach file, \
170181
$(eval $(call openj9_stage_buildspec_file,$(file))))
171182

172183
J9TOOLS_DIR := $(JDK_OUTPUTDIR)/j9tools
173-
JPP_JAR := $(J9TOOLS_DIR)/jpp.jar
174-
175-
build-openj9-tools :
176-
@$(ECHO) Building OpenJ9 Java Preprocessor
177-
@$(MKDIR) -p $(J9TOOLS_DIR)
178-
$(MAKE) -C $(OPENJ9_TOPDIR)/sourcetools $(MAKEFLAGS) -f buildj9tools.mk \
179-
BOOT_JDK=$(BOOT_JDK) \
180-
DEST_DIR=$(call FixPath,$(J9TOOLS_DIR)) \
181-
JAVA_HOME=$(BOOT_JDK) \
182-
$(call FixPath,$(JPP_JAR))
183184

184185
stage-j9 :
185186
@$(ECHO) Staging OpenJ9 runtime in $(OPENJ9_VM_BUILD_DIR)
@@ -337,6 +338,7 @@ ifneq (,$(filter debug trace, $(LOG_LEVEL)))
337338
CMAKE_ARGS += -DCMAKE_VERBOSE_MAKEFILE=ON
338339
endif
339340

341+
# Do this last so extra args take precedence.
340342
CMAKE_ARGS += $(EXTRA_CMAKE_ARGS)
341343

342344
$(OUTPUT_ROOT)/vm/cmake.stamp :
@@ -367,9 +369,8 @@ endif # OPENJ9_ENABLE_JITSERVER
367369
run-preprocessors-j9 : stage-j9
368370
@$(ECHO) Running OpenJ9 preprocessors with OPENJ9_BUILDSPEC: $(OPENJ9_BUILDSPEC)
369371
@$(MKDIR) -p $(J9TOOLS_DIR)
370-
export $(EXPORT_MSVS_ENV_VARS) \
371-
OPENJDK_VERSION_NUMBER_FOUR_POSITIONS=$(VERSION_NUMBER_FOUR_POSITIONS) \
372-
&& $(MAKE) -C $(OUTPUT_ROOT)/vm $(MAKEFLAGS) -f $(OPENJ9_TOPDIR)/runtime/buildtools.mk \
372+
+$(EXPORT_MSVS_ENV_VARS) OPENJDK_VERSION_NUMBER_FOUR_POSITIONS=$(VERSION_NUMBER_FOUR_POSITIONS) \
373+
$(MAKE) $(MAKE_ARGS) -C $(OUTPUT_ROOT)/vm -f $(OPENJ9_TOPDIR)/runtime/buildtools.mk \
373374
BOOT_JDK=$(BOOT_JDK) \
374375
BUILD_ID=$(BUILD_ID) \
375376
DEST_DIR=$(call FixPath,$(J9TOOLS_DIR)) \
@@ -386,7 +387,7 @@ run-preprocessors-j9 : stage-j9
386387

387388
endif # OPENJ9_ENABLE_CMAKE
388389

389-
run-preprocessors-j9 : generate-j9-version-headers
390+
run-preprocessors-j9 : generate-j9-version-headers generate-j9jcl-sources
390391

391392
ifeq (true,$(OPENJ9_ENABLE_CMAKE))
392393
# Both cmake and the makefiles it generates are sensitive to the VERBOSE
@@ -398,9 +399,13 @@ else
398399
endif
399400

400401
build-j9vm : run-preprocessors-j9
401-
@$(ECHO) Compiling OpenJ9 in $(OPENJ9_VM_BUILD_DIR)
402-
export OPENJ9_BUILD=true $(EXPORT_MSVS_ENV_VARS) $(CUSTOM_COMPILER_ENV_VARS) \
403-
&& $(MAKE_VM) -C $(OUTPUT_ROOT)/vm $(MAKEFLAGS) JAVA_VERSION=80 VERSION_MAJOR=8 all
402+
@$(ECHO) "Compiling OpenJ9 in $(OUTPUT_ROOT)/vm"
403+
@$(ECHO) " Source version info:"
404+
@$(ECHO) " openjdk - $(OPENJDK_SHA)"
405+
@$(ECHO) " openj9 - $(OPENJ9_SHA)"
406+
@$(ECHO) " omr - $(OPENJ9OMR_SHA)"
407+
+export OPENJ9_BUILD=true $(EXPORT_MSVS_ENV_VARS) $(CUSTOM_COMPILER_ENV_VARS) \
408+
&& $(MAKE_VM) $(MAKE_ARGS) -C $(OUTPUT_ROOT)/vm JAVA_VERSION=80 VERSION_MAJOR=8 all
404409
@$(ECHO) OpenJ9 compile complete
405410

406411
J9JCL_SOURCES_DONEFILE := $(JDK_OUTPUTDIR)/j9jcl_sources/j9jcl_sources.done
@@ -409,14 +414,21 @@ recur_wildcard = $(foreach dir,$(wildcard $1/*),$(call recur_wildcard,$(dir),$2)
409414
AllJclSource = $(call recur_wildcard,$(OPENJ9_TOPDIR)/jcl/src,*.java)
410415

411416
JPP_DEST := $(JDK_OUTPUTDIR)/j9jcl_sources/jdk/src/share/classes
412-
417+
JPP_JAR := $(J9TOOLS_DIR)/jpp.jar
413418
JPP_TAGS := PLATFORM-$(OPENJ9_PLATFORM_CODE)
414419

415420
ifeq (true,$(OPENJ9_ENABLE_OPENJDK_METHODHANDLES))
416-
JPP_TAGS := $(JPP_TAGS);OPENJDK_METHODHANDLES
421+
JPP_TAGS += OPENJDK_METHODHANDLES
417422
endif # OPENJ9_ENABLE_OPENJDK_METHODHANDLES
418423

419424
$(J9JCL_SOURCES_DONEFILE) : $(AllJclSource)
425+
@$(ECHO) Building OpenJ9 Java Preprocessor
426+
@$(MKDIR) -p $(J9TOOLS_DIR)
427+
$(MAKE) $(MAKE_ARGS) -C $(OPENJ9_TOPDIR)/sourcetools -f buildj9tools.mk \
428+
BOOT_JDK=$(BOOT_JDK) \
429+
DEST_DIR=$(call FixPath,$(J9TOOLS_DIR)) \
430+
JAVA_HOME=$(BOOT_JDK) \
431+
$(call FixPath,$(JPP_JAR))
420432
@$(ECHO) Generating J9JCL sources
421433
$(BOOT_JDK)/bin/java \
422434
-cp "$(call FixPath,$(JPP_JAR))" \
@@ -440,7 +452,7 @@ $(J9JCL_SOURCES_DONEFILE) : $(AllJclSource)
440452
-srcRoot jcl/ \
441453
-xml jpp_configuration.xml \
442454
-dest "$(call FixPath,$(JPP_DEST))" \
443-
-tag:define "$(JPP_TAGS)"
455+
-tag:define "$(subst $(SPACE),;,$(sort $(JPP_TAGS)))"
444456
@$(MKDIR) -p $(@D)
445457
@$(TOUCH) $@
446458

‎closed/make/BuildJdk.gmk

-1
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,4 @@ OPENJ9_MAKE := $(MAKE) -f $(SRC_ROOT)/closed/OpenJ9.gmk SPEC=$(SPEC)
2727
.PHONY : generate_openj9_j9jcl
2828

2929
generate_openj9_j9jcl :
30-
+$(OPENJ9_MAKE) build-openj9-tools
3130
+$(OPENJ9_MAKE) generate-j9jcl-sources

‎closed/make/Main.gmk

+16-6
Original file line numberDiff line numberDiff line change
@@ -26,37 +26,47 @@ clean-j9vm :
2626
.PHONY : \
2727
build-j9vm \
2828
clean-j9vm \
29+
clean-openj9-only-docs \
2930
debug-image \
3031
test-image \
3132
test-image-openj9 \
3233
#
3334

35+
# Override definition from MakeBase.gmk for OpenJ9.
36+
define GetSourceTips
37+
$(PRINTF) "%s:%s\n" \
38+
OpenJDK "$(shell git -C $(TOPDIR) rev-parse --short HEAD)" \
39+
OpenJ9 "$(shell git -C $(OPENJ9_TOPDIR) rev-parse --short HEAD)" \
40+
OMR "$(shell git -C $(OPENJ9OMR_TOPDIR) rev-parse --short HEAD)" \
41+
> $@
42+
endef
43+
3444
jdk : build-j9vm
3545

3646
build-j9vm : start-make
3747
ifeq ($(BUILD_OPENSSL),yes)
38-
@$(MAKE) $(MAKE_ARGS) -f $(SRC_ROOT)/closed/openssl.gmk
48+
@+$(MAKE) $(MAKE_ARGS) -f $(SRC_ROOT)/closed/openssl.gmk
3949
endif # BUILD_OPENSSL
40-
@$(MAKE) $(MAKE_ARGS) -f $(SRC_ROOT)/closed/OpenJ9.gmk build-j9vm
41-
@$(MAKE) $(MAKE_ARGS) -f $(SRC_ROOT)/closed/CopyToBuildJdk.gmk
50+
@+$(MAKE) $(MAKE_ARGS) -f $(SRC_ROOT)/closed/OpenJ9.gmk build-j9vm
51+
@+$(MAKE) $(MAKE_ARGS) -f $(SRC_ROOT)/closed/CopyToBuildJdk.gmk
4252

4353
all : debug-image
4454

4555
debug-image : images
46-
@$(MAKE) $(MAKE_ARGS) -f $(SRC_ROOT)/closed/DebugImage.gmk
56+
@+$(MAKE) $(MAKE_ARGS) -f $(SRC_ROOT)/closed/DebugImage.gmk
4757

4858
all : test-image
4959

5060
test-image : test-image-openj9
5161

5262
# If not cross-compiling, capture 'java -version' output.
5363
test-image-openj9 : images
54-
@$(MAKE) $(MAKE_ARGS) -f $(SRC_ROOT)/closed/TestImage.gmk
64+
@+$(MAKE) $(MAKE_ARGS) -f $(SRC_ROOT)/closed/TestImage.gmk
5565
ifneq ($(COMPILE_TYPE), cross)
5666
$(JRE_IMAGE_DIR)/bin/java -version 2>&1 | $(TEE) $(IMAGES_OUTPUTDIR)/test/openj9/java-version.txt
5767
endif
5868

5969
clean-docs : clean-openj9-only-docs
70+
6071
clean-openj9-only-docs :
6172
$(call CleanComponent,openj9-docs)
62-
.PHONY : clean-openj9-only-docs

‎common/autoconf/generated-configure.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -4410,7 +4410,7 @@ VS_SDK_PLATFORM_NAME_2017=
44104410
#CUSTOM_AUTOCONF_INCLUDE
44114411

44124412
# Do not change or remove the following line, it is needed for consistency checks:
4413-
DATE_WHEN_GENERATED=1600276123
4413+
DATE_WHEN_GENERATED=1604507962
44144414

44154415
###############################################################################
44164416
#

‎jdk/make/closed/autoconf/custom-hook.m4

+21-25
Original file line numberDiff line numberDiff line change
@@ -368,10 +368,6 @@ AC_DEFUN([OPENJDK_VERSION_DETAILS],
368368
AC_SUBST(JDK_MOD_VERSION)
369369
AC_SUBST(JDK_FIX_VERSION)
370370
371-
OPENJDK_SHA=`git -C $SRC_ROOT rev-parse --short HEAD`
372-
373-
AC_SUBST(OPENJDK_SHA)
374-
375371
# Outer [ ] to quote m4.
376372
[ USERNAME=`$ECHO "$USER" | $TR -d -c '[a-z][A-Z][0-9]'` ]
377373
AC_SUBST(USERNAME)
@@ -474,10 +470,10 @@ AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_MSVCP_DLL],
474470
POSSIBLE_MSVCP_DLL="$1"
475471
METHOD="$2"
476472
if test -e "$POSSIBLE_MSVCP_DLL" ; then
477-
AC_MSG_NOTICE([Found msvcp100.dll at $POSSIBLE_MSVCP_DLL using $METHOD])
473+
AC_MSG_NOTICE([Found msvcp120.dll at $POSSIBLE_MSVCP_DLL using $METHOD])
478474
479475
# Need to check if the found msvcp is correct architecture
480-
AC_MSG_CHECKING([found msvcp100.dll architecture])
476+
AC_MSG_CHECKING([found msvcp120.dll architecture])
481477
MSVCP_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVCP_DLL"`
482478
if test "x$OPENJDK_TARGET_CPU_BITS" = x32 ; then
483479
CORRECT_MSVCP_ARCH=386
@@ -487,67 +483,67 @@ AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_MSVCP_DLL],
487483
if $ECHO "$MSVCP_DLL_FILETYPE" | $GREP $CORRECT_MSVCP_ARCH 2>&1 > /dev/null ; then
488484
AC_MSG_RESULT([ok])
489485
MSVCP_DLL="$POSSIBLE_MSVCP_DLL"
490-
AC_MSG_CHECKING([for msvcp100.dll])
486+
AC_MSG_CHECKING([for msvcp120.dll])
491487
AC_MSG_RESULT([$MSVCP_DLL])
492488
else
493489
AC_MSG_RESULT([incorrect, ignoring])
494-
AC_MSG_NOTICE([The file type of the located msvcp100.dll is $MSVCP_DLL_FILETYPE])
490+
AC_MSG_NOTICE([The file type of the located msvcp120.dll is $MSVCP_DLL_FILETYPE])
495491
fi
496492
fi
497493
])
498494

499495
AC_DEFUN([TOOLCHAIN_SETUP_MSVCP_DLL],
500496
[
501497
AC_ARG_WITH(msvcp-dll, [AS_HELP_STRING([--with-msvcp-dll],
502-
[copy this msvcp100.dll into the built JDK (Windows only) @<:@probed@:>@])])
498+
[copy this msvcp120.dll into the built JDK (Windows only) @<:@probed@:>@])])
503499
504500
if test "x$with_msvcp_dll" != x ; then
505501
# If given explicitly by user, do not probe. If not present, fail directly.
506502
TOOLCHAIN_CHECK_POSSIBLE_MSVCP_DLL([$with_msvcp_dll], [--with-msvcp-dll])
507503
if test "x$MSVCP_DLL" = x ; then
508-
AC_MSG_ERROR([Could not find a proper msvcp100.dll as specified by --with-msvcp-dll])
504+
AC_MSG_ERROR([Could not find a proper msvcp120.dll as specified by --with-msvcp-dll])
509505
fi
510506
fi
511507
512508
if test "x$MSVCP_DLL" = x ; then
513-
# Probe: Using well-known location from Visual Studio 10.0
509+
# Probe: Using well-known location from Visual Studio 12.0
514510
if test "x$VCINSTALLDIR" != x ; then
515511
CYGWIN_VC_INSTALL_DIR="$VCINSTALLDIR"
516512
BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(CYGWIN_VC_INSTALL_DIR)
517513
if test "x$OPENJDK_TARGET_CPU_BITS" = x64 ; then
518-
POSSIBLE_MSVCP_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x64/Microsoft.VC100.CRT/msvcp100.dll"
514+
POSSIBLE_MSVCP_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x64/Microsoft.VC120.CRT/msvcp120.dll"
519515
else
520-
POSSIBLE_MSVCP_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x86/Microsoft.VC100.CRT/msvcp100.dll"
516+
POSSIBLE_MSVCP_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x86/Microsoft.VC120.CRT/msvcp120.dll"
521517
fi
522518
TOOLCHAIN_CHECK_POSSIBLE_MSVCP_DLL([$POSSIBLE_MSVCP_DLL], [well-known location in VCINSTALLDIR])
523519
fi
524520
fi
525521
526522
if test "x$MSVCP_DLL" = x ; then
527523
# Probe: Check in the Boot JDK directory.
528-
POSSIBLE_MSVCP_DLL="$BOOT_JDK/bin/msvcp100.dll"
524+
POSSIBLE_MSVCP_DLL="$BOOT_JDK/bin/msvcp120.dll"
529525
TOOLCHAIN_CHECK_POSSIBLE_MSVCP_DLL([$POSSIBLE_MSVCP_DLL], [well-known location in Boot JDK])
530526
fi
531527
532528
if test "x$MSVCP_DLL" = x ; then
533529
# Probe: Look in the Windows system32 directory
534530
CYGWIN_SYSTEMROOT="$SYSTEMROOT"
535531
BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(CYGWIN_SYSTEMROOT)
536-
POSSIBLE_MSVCP_DLL="$CYGWIN_SYSTEMROOT/system32/msvcp100.dll"
532+
POSSIBLE_MSVCP_DLL="$CYGWIN_SYSTEMROOT/system32/msvcp120.dll"
537533
TOOLCHAIN_CHECK_POSSIBLE_MSVCP_DLL([$POSSIBLE_MSVCP_DLL], [well-known location in SYSTEMROOT])
538534
fi
539535
540536
if test "x$MSVCP_DLL" = x ; then
541537
# Probe: If Visual Studio Express is installed, there is usually one with the debugger
542-
if test "x$VS100COMNTOOLS" != x ; then
543-
CYGWIN_VS_TOOLS_DIR="$VS100COMNTOOLS/.."
538+
if test "x$VS120COMNTOOLS" != x ; then
539+
CYGWIN_VS_TOOLS_DIR="$VS120COMNTOOLS/.."
544540
BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(CYGWIN_VS_TOOLS_DIR)
545541
if test "x$OPENJDK_TARGET_CPU_BITS" = x64 ; then
546-
POSSIBLE_MSVCP_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name msvcp100.dll | $GREP -i /x64/ | $HEAD --lines 1`
542+
POSSIBLE_MSVCP_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name msvcp120.dll | $GREP -i /x64/ | $HEAD --lines 1`
547543
else
548-
POSSIBLE_MSVCP_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name msvcp100.dll | $GREP -i /x86/ | $HEAD --lines 1`
544+
POSSIBLE_MSVCP_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name msvcp120.dll | $GREP -i /x86/ | $HEAD --lines 1`
549545
fi
550-
TOOLCHAIN_CHECK_POSSIBLE_MSVCP_DLL([$POSSIBLE_MSVCP_DLL], [search of VS100COMNTOOLS])
546+
TOOLCHAIN_CHECK_POSSIBLE_MSVCP_DLL([$POSSIBLE_MSVCP_DLL], [search of VS120COMNTOOLS])
551547
fi
552548
fi
553549
@@ -556,12 +552,12 @@ AC_DEFUN([TOOLCHAIN_SETUP_MSVCP_DLL],
556552
# (This was the original behaviour ; kept since it might turn up something)
557553
if test "x$CYGWIN_VC_INSTALL_DIR" != x ; then
558554
if test "x$OPENJDK_TARGET_CPU_BITS" = x64 ; then
559-
POSSIBLE_MSVCP_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcp100.dll | $GREP x64 | $HEAD --lines 1`
555+
POSSIBLE_MSVCP_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcp120.dll | $GREP x64 | $HEAD --lines 1`
560556
else
561-
POSSIBLE_MSVCP_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcp100.dll | $GREP x86 | $GREP -v ia64 | $GREP -v x64 | $HEAD --lines 1`
557+
POSSIBLE_MSVCP_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcp120.dll | $GREP x86 | $GREP -v ia64 | $GREP -v x64 | $HEAD --lines 1`
562558
if test "x$POSSIBLE_MSVCP_DLL" = x ; then
563559
# We're grasping at straws now...
564-
POSSIBLE_MSVCP_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcp100.dll | $HEAD --lines 1`
560+
POSSIBLE_MSVCP_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name msvcp120.dll | $HEAD --lines 1`
565561
fi
566562
fi
567563
@@ -570,9 +566,9 @@ AC_DEFUN([TOOLCHAIN_SETUP_MSVCP_DLL],
570566
fi
571567
572568
if test "x$MSVCP_DLL" = x ; then
573-
AC_MSG_CHECKING([for msvcp100.dll])
569+
AC_MSG_CHECKING([for msvcp120.dll])
574570
AC_MSG_RESULT([no])
575-
AC_MSG_ERROR([Could not find msvcp100.dll. Please specify using --with-msvcp-dll.])
571+
AC_MSG_ERROR([Could not find msvcp120.dll. Please specify using --with-msvcp-dll.])
576572
fi
577573
578574
BASIC_FIXUP_PATH(MSVCP_DLL)

‎jdk/make/closed/autoconf/custom-spec.gmk.in

+6-6
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ ifneq (,@OPENJ9_GDK_HOME@)
3939
export GDK_HOME := @OPENJ9_GDK_HOME@
4040
endif
4141

42-
# OPENSSL
42+
# OpenSSL
4343
OPENSSL_DIR := @OPENSSL_DIR@
4444
BUILD_OPENSSL := @BUILD_OPENSSL@
4545
OPENSSL_CFLAGS := @OPENSSL_CFLAGS@
@@ -58,7 +58,6 @@ OPENJ9_ENABLE_OPENJDK_METHODHANDLES := @OPENJ9_ENABLE_OPENJDK_METHODHANDLES@
5858
# for constructing version output
5959
COMPILER_VERSION_STRING := @COMPILER_VERSION_STRING@
6060
USERNAME := @USERNAME@
61-
OPENJDK_SHA := @OPENJDK_SHA@
6261

6362
include $(SRC_ROOT)/closed/openjdk-tag.gmk
6463

@@ -69,8 +68,8 @@ J9JDK_EXT_VERSION := HEAD
6968
J9JDK_EXT_NAME := Extensions for OpenJDK for Eclipse OpenJ9
7069

7170
# required by CMake
72-
CMAKE := @CMAKE@
73-
export OPENJ9_ENABLE_CMAKE := @OPENJ9_ENABLE_CMAKE@
71+
CMAKE := @CMAKE@
72+
OPENJ9_ENABLE_CMAKE := @OPENJ9_ENABLE_CMAKE@
7473

7574
# required by UMA
7675
FREEMARKER_JAR := @FREEMARKER_JAR@
@@ -123,8 +122,9 @@ else
123122
"$1"
124123
endif
125124

125+
# Use '=' instead of ':=' because bootcycle-spec.gmk overrides OUTPUT_ROOT.
126126
ifeq (true,$(OPENJ9_ENABLE_CMAKE))
127-
OPENJ9_VM_BUILD_DIR := $(OUTPUT_ROOT)/vm/runtime
127+
OPENJ9_VM_BUILD_DIR = $(OUTPUT_ROOT)/vm/runtime
128128
else
129-
OPENJ9_VM_BUILD_DIR := $(OUTPUT_ROOT)/vm
129+
OPENJ9_VM_BUILD_DIR = $(OUTPUT_ROOT)/vm
130130
endif

0 commit comments

Comments
 (0)