8136980: build for 8u65 and 8u66 for solaris platforms is failing

Tue, 06 Oct 2015 12:18:17 +0200

author
erikj
date
Tue, 06 Oct 2015 12:18:17 +0200
changeset 8072
aa97f9321b9c
parent 8070
c0205eddb317
child 8073
682119c4c32e

8136980: build for 8u65 and 8u66 for solaris platforms is failing
Reviewed-by: ihse, mikael, brutisso

make/solaris/makefiles/buildtree.make file | annotate | diff | comparison | revisions
make/solaris/makefiles/vm.make file | annotate | diff | comparison | revisions
     1.1 --- a/make/solaris/makefiles/buildtree.make	Wed Sep 30 14:50:11 2015 +0200
     1.2 +++ b/make/solaris/makefiles/buildtree.make	Tue Oct 06 12:18:17 2015 +0200
     1.3 @@ -265,9 +265,12 @@
     1.4  	    echo "HOTSPOT_EXTRA_SYSDEFS\$$(HOTSPOT_EXTRA_SYSDEFS) = $(HOTSPOT_EXTRA_SYSDEFS)" && \
     1.5  	    echo "SYSDEFS += \$$(HOTSPOT_EXTRA_SYSDEFS)"; \
     1.6  	echo; \
     1.7 +	[ -n "$(INCLUDE_TRACE)" ] && \
     1.8 +	    echo && echo "INCLUDE_TRACE = $(INCLUDE_TRACE)"; \
     1.9  	[ -n "$(SPEC)" ] && \
    1.10  	    echo "include $(SPEC)"; \
    1.11  	echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(VARIANT).make"; \
    1.12 +	echo "include \$$(GAMMADIR)/make/excludeSrc.make"; \
    1.13  	echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(COMPILER).make"; \
    1.14  	) > $@
    1.15  
     2.1 --- a/make/solaris/makefiles/vm.make	Wed Sep 30 14:50:11 2015 +0200
     2.2 +++ b/make/solaris/makefiles/vm.make	Tue Oct 06 12:18:17 2015 +0200
     2.3 @@ -204,7 +204,7 @@
     2.4  ZERO_SPECIFIC_FILES      := zero
     2.5  
     2.6  # Always exclude these.
     2.7 -Src_Files_EXCLUDE := dtrace jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp
     2.8 +Src_Files_EXCLUDE += dtrace jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp
     2.9  
    2.10  # Exclude per type.
    2.11  Src_Files_EXCLUDE/CORE      := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp

mercurial