2020-01-23 23:00:21 +01:00
|
|
|
--- a/closed/OpenJ9.gmk 2020-01-23 11:32:56.700658325 +0100
|
2020-01-24 00:53:49 +01:00
|
|
|
+++ b/closed/OpenJ9.gmk 2020-01-23 23:25:54.764578248 +0100
|
2020-01-23 23:00:21 +01:00
|
|
|
@@ -29,15 +29,15 @@
|
|
|
|
|
BUILD_ID := 000000
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
-OPENJ9_SHA := $(shell git -C $(OPENJ9_TOPDIR) rev-parse --short HEAD)
|
|
|
|
|
+OPENJ9_SHA := @OPENJ9_SHA@
|
|
|
|
|
ifeq (,$(OPENJ9_SHA))
|
|
|
|
|
$(error Could not determine OpenJ9 SHA)
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
# Find OpenJ9 tag associated with current commit (suppressing stderr in case there is no such tag).
|
|
|
|
|
-OPENJ9_TAG := $(shell git -C $(OPENJ9_TOPDIR) describe --exact-match HEAD 2>/dev/null)
|
|
|
|
|
+OPENJ9_TAG := @OPENJ9_TAG@
|
|
|
|
|
ifeq (,$(OPENJ9_TAG))
|
|
|
|
|
- OPENJ9_BRANCH := $(shell git -C $(OPENJ9_TOPDIR) rev-parse --abbrev-ref HEAD)
|
|
|
|
|
+ OPENJ9_BRANCH := @OPENJ9_BRANCH@
|
|
|
|
|
ifeq (,$(OPENJ9_BRANCH))
|
|
|
|
|
$(error Could not determine OpenJ9 branch)
|
|
|
|
|
endif
|
|
|
|
|
@@ -46,7 +46,7 @@
|
|
|
|
|
OPENJ9_VERSION_STRING := $(OPENJ9_TAG)
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
-OPENJ9OMR_SHA := $(shell git -C $(OPENJ9OMR_TOPDIR) rev-parse --short HEAD)
|
|
|
|
|
+OPENJ9OMR_SHA := @OPENJ9OMR_SHA@
|
|
|
|
|
ifeq (,$(OPENJ9OMR_SHA))
|
|
|
|
|
$(error Could not determine OMR SHA)
|
|
|
|
|
endif
|
2020-01-24 00:53:49 +01:00
|
|
|
--- a/jdk/make/closed/autoconf/custom-hook.m4 2020-01-23 11:32:57.428662256 +0100
|
|
|
|
|
+++ b/jdk/make/closed/autoconf/custom-hook.m4 2020-01-23 23:30:36.802221424 +0100
|
|
|
|
|
@@ -368,7 +368,7 @@
|
|
|
|
|
AC_SUBST(JDK_MOD_VERSION)
|
|
|
|
|
AC_SUBST(JDK_FIX_VERSION)
|
|
|
|
|
|
|
|
|
|
- OPENJDK_SHA=`git -C $SRC_ROOT rev-parse --short HEAD`
|
|
|
|
|
+ OPENJDK_SHA=@OPENJDK_SHA@
|
|
|
|
|
|
|
|
|
|
AC_SUBST(OPENJDK_SHA)
|
|
|
|
|
|
