# HG changeset patch # User jwilhelm # Date 1408706644 -7200 # Node ID 28b4223e2ea7f7646cacef0114638372eacd9464 # Parent f933a15469d460e9900f4e2adbafcaabb2faa185 8055744: 8u-dev nightly solaris builds failed on 08/20 Summary: Fixed makefiles on solaris to allow build with extra symbols. Reviewed-by: dcubed, erikj diff -r f933a15469d4 -r 28b4223e2ea7 make/solaris/Makefile --- a/make/solaris/Makefile Mon Jul 28 22:43:08 2014 +0200 +++ b/make/solaris/Makefile Fri Aug 22 13:24:04 2014 +0200 @@ -159,6 +159,7 @@ BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) ARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH) BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) HOTSPOT_BUILD_VERSION=$(HOTSPOT_BUILD_VERSION) JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) BUILDTREE_VARS += ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS) OBJCOPY=$(OBJCOPY) STRIP_POLICY=$(STRIP_POLICY) ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES) ZIPEXE=$(ZIPEXE) +BUILDTREE_VARS += HS_ALT_MAKE=$(HS_ALT_MAKE) BUILDTREE = $(MAKE) -f $(BUILDTREE_MAKE) $(BUILDTREE_VARS) diff -r f933a15469d4 -r 28b4223e2ea7 make/solaris/makefiles/buildtree.make --- a/make/solaris/makefiles/buildtree.make Mon Jul 28 22:43:08 2014 +0200 +++ b/make/solaris/makefiles/buildtree.make Fri Aug 22 13:24:04 2014 +0200 @@ -258,6 +258,8 @@ echo && echo "ZIP_DEBUGINFO_FILES = $(ZIP_DEBUGINFO_FILES)"; \ [ -n "$(ZIPEXE)" ] && \ echo && echo "ZIPEXE = $(ZIPEXE)"; \ + [ -n "$(HS_ALT_MAKE)" ] && \ + echo && echo "HS_ALT_MAKE = $(HS_ALT_MAKE)"; \ [ -n "$(HOTSPOT_EXTRA_SYSDEFS)" ] && \ echo && \ echo "HOTSPOT_EXTRA_SYSDEFS\$$(HOTSPOT_EXTRA_SYSDEFS) = $(HOTSPOT_EXTRA_SYSDEFS)" && \