--- old/make/bsd/makefiles/buildtree.make	2016-02-10 21:04:55.000000000 +0100
+++ new/make/bsd/makefiles/buildtree.make	2016-02-10 21:04:55.000000000 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -52,9 +52,6 @@
 # The makefiles are split this way so that "make foo" will run faster by not
 # 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/scm.make
 include $(GAMMADIR)/make/defs.make
@@ -114,11 +111,11 @@
 COMPILER	= $(shell sed -n 's/^compiler[ 	]*=[ 	]*//p' $(PLATFORM_FILE))
 
 # dtracefiles is used on BSD versions that implement Dtrace (like MacOS X)
-SIMPLE_DIRS	= \
-	$(PLATFORM_DIR)/generated/dependencies \
-	$(PLATFORM_DIR)/generated/adfiles \
-	$(PLATFORM_DIR)/generated/jvmtifiles \
-	$(PLATFORM_DIR)/generated/tracefiles \
+SIMPLE_DIRS	=                                       \
+	$(PLATFORM_DIR)/generated/dependencies          \
+	$(PLATFORM_DIR)/generated/adfiles               \
+	$(PLATFORM_DIR)/generated/jvmtifiles            \
+	$(PLATFORM_DIR)/generated/tracefiles            \
 	$(PLATFORM_DIR)/generated/dtracefiles
 
 TARGETS      = debug fastdebug optimized product
@@ -167,7 +164,7 @@
 
 BUILDTREE_COMMENT	= echo "\# Generated by $(BUILDTREE_MAKE)"
 
-all:  $(SUBMAKE_DIRS)
+all: $(SUBMAKE_DIRS)
 
 # Run make in each subdirectory recursively.
 $(SUBMAKE_DIRS): $(SIMPLE_DIRS) FORCE