*** old/make/bsd/makefiles/buildtree.make	Fri Sep 21 10:48:11 2012
--- new/make/bsd/makefiles/buildtree.make	Fri Sep 21 10:48:10 2012

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

*** 193,202 ****
--- 194,205 ----
          echo; \
          echo "Platform_file = $(PLATFORM_FILE)" | sed 's|$(GAMMADIR)|$$(GAMMADIR)|'; \
          sed -n '/=/s/^ */Platform_/p' < $(PLATFORM_FILE); \
          echo; \
          echo "GAMMADIR = $(GAMMADIR)"; \
+         echo "HS_ALT_MAKE = $(HS_ALT_MAKE)"; \
+         echo "OSNAME = $(OSNAME)"; \
          echo "SYSDEFS = \$$(Platform_sysdefs)"; \
          echo "SRCARCH = $(SRCARCH)"; \
          echo "BUILDARCH = $(BUILDARCH)"; \
          echo "LIBARCH = $(LIBARCH)"; \
          echo "TARGET = $(TARGET)"; \

*** 249,258 ****
--- 252,262 ----
              echo "SYSDEFS += \$$(HOTSPOT_EXTRA_SYSDEFS)"; \
          echo; \
          [ -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"; \
          ) > $@
  
  flags_vm.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
          @echo Creating $@ ...