make/bsd/makefiles/buildtree.make

Print this page
rev 4938 : 8024648: 8016131 & new build (7141426) break Zero port
Summary: Fix breakages in Zero port caused by 7141426 and 8016131.
Reviewed-by: amurillo, dholmes

@@ -1,7 +1,8 @@
 #
 # Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013 Red Hat, Inc.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 only, as
 # published by the Free Software Foundation.

@@ -57,11 +58,11 @@
 # having to read the dependency files for the vm.
 
 # needs to be set here since this Makefile doesn't include defs.make
 OS_VENDOR:=$(shell uname -s)
 
--include $(SPEC)
+include $(GAMMADIR)/make/defs.make
 include $(GAMMADIR)/make/scm.make
 include $(GAMMADIR)/make/altsrc.make
 
 
 # 'gmake MAKE_VERBOSE=y' or 'gmake QUIETLY=' gives all the gory details.

@@ -213,10 +214,11 @@
         echo "JRE_RELEASE_VER = $(JRE_RELEASE_VERSION)"; \
         echo "SA_BUILD_VERSION = $(HS_BUILD_VER)"; \
         echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \
         echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \
         echo "OPENJDK = $(OPENJDK)"; \
+        echo "ZERO_BUILD = $(ZERO_BUILD)"; \
         echo; \
         echo "# Used for platform dispatching"; \
         echo "TARGET_DEFINES  = -DTARGET_OS_FAMILY_\$$(Platform_os_family)"; \
         echo "TARGET_DEFINES += -DTARGET_ARCH_\$$(Platform_arch)"; \
         echo "TARGET_DEFINES += -DTARGET_ARCH_MODEL_\$$(Platform_arch_model)"; \