Mercurial > hg > graal-jvmci-8
changeset 23425:aa97f9321b9c
8136980: build for 8u65 and 8u66 for solaris platforms is failing
Reviewed-by: ihse, mikael, brutisso
author | erikj |
---|---|
date | Tue, 06 Oct 2015 12:18:17 +0200 |
parents | c0205eddb317 |
children | 682119c4c32e |
files | make/solaris/makefiles/buildtree.make make/solaris/makefiles/vm.make |
diffstat | 2 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/make/solaris/makefiles/buildtree.make Wed Sep 30 14:50:11 2015 +0200 +++ b/make/solaris/makefiles/buildtree.make Tue Oct 06 12:18:17 2015 +0200 @@ -265,9 +265,12 @@ echo "HOTSPOT_EXTRA_SYSDEFS\$$(HOTSPOT_EXTRA_SYSDEFS) = $(HOTSPOT_EXTRA_SYSDEFS)" && \ echo "SYSDEFS += \$$(HOTSPOT_EXTRA_SYSDEFS)"; \ echo; \ + [ -n "$(INCLUDE_TRACE)" ] && \ + echo && echo "INCLUDE_TRACE = $(INCLUDE_TRACE)"; \ [ -n "$(SPEC)" ] && \ echo "include $(SPEC)"; \ echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(VARIANT).make"; \ + echo "include \$$(GAMMADIR)/make/excludeSrc.make"; \ echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(COMPILER).make"; \ ) > $@
--- a/make/solaris/makefiles/vm.make Wed Sep 30 14:50:11 2015 +0200 +++ b/make/solaris/makefiles/vm.make Tue Oct 06 12:18:17 2015 +0200 @@ -204,7 +204,7 @@ ZERO_SPECIFIC_FILES := zero # Always exclude these. -Src_Files_EXCLUDE := dtrace jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp +Src_Files_EXCLUDE += dtrace jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp # Exclude per type. Src_Files_EXCLUDE/CORE := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp