forked from pool/java-1_8_0-openj9
31 lines
1.0 KiB
Diff
31 lines
1.0 KiB
Diff
|
--- a/closed/OpenJ9.gmk 2020-01-23 11:32:56.700658325 +0100
|
||
|
|
+++ b/closed/OpenJ9.gmk 2020-01-23 11:48:34.737730143 +0100
|
||
|
|
@@ -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
|