stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
J. Duke 2017-07-05 17:22:39 +02:00
commit 4ac932b0f7
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hgtags-top-repo
View File

@ -85,3 +85,4 @@ f8be576feefce0c6695f188ef97ec16b73ad9cfd jdk7-b104
140fdef4ddf52244013b6157dc542cd9f677bb6f jdk7-b108
81dfc728d7bb7e1fff4a4dc6d0f7cea5a3315667 jdk7-b109
2a02d4a6955c7c078aee9a604cb3be409800d82c jdk7-b110
9702d6fef68e17533ee7fcf5923b11ead3e912ce jdk7-b111

6
make/hotspot-rules.gmk
View File

@ -73,7 +73,11 @@ ifeq ($(DEBUG_NAME), fastdebug)
endif
ifeq ($(ZERO_BUILD), true)
HOTSPOT_TARGET := $(HOTSPOT_TARGET)zero
ifeq ($(SHARK_BUILD), true)
HOTSPOT_TARGET := $(HOTSPOT_TARGET)shark
else
HOTSPOT_TARGET := $(HOTSPOT_TARGET)zero
endif
endif
HOTSPOT_BUILD_ARGUMENTS += $(COMMON_BUILD_ARGUMENTS)