From 0c0fe27b9f1de8c6b466b2f124c70f473c5645d5 Mon Sep 17 00:00:00 2001
From: Dave Barach <dave@barachs.net>
Date: Tue, 31 Oct 2017 16:28:11 -0400
Subject: [PATCH] Clean up a few historical anomalies

Change-Id: I5d36a8a54fa6f73ea2b3761413098867dae1df74
Signed-off-by: Dave Barach <dave@barachs.net>
---
 build-root/Makefile | 28 ++++++----------------------
 1 file changed, 6 insertions(+), 22 deletions(-)

diff --git a/build-root/Makefile b/build-root/Makefile
index 81f7b9011b8..6298ea1f22b 100644
--- a/build-root/Makefile
+++ b/build-root/Makefile
@@ -258,13 +258,7 @@ tool_or_package_fn = $(if $(is_build_tool),tool,package)
 
 # Directory where packages are built & installed
 BUILD_DIR = $(MU_BUILD_ROOT_DIR)/$(BUILD_PREFIX_$(call tool_or_package_fn))$(ARCH)
-
-## BURT
-# we will deprecate INSTALL_DIR shortly for DFLT_INSTALL_DIR
 INSTALL_DIR = $(MU_BUILD_ROOT_DIR)/$(INSTALL_PREFIX)$(ARCH)
-# DFLT_INSTALL_DIR used in platforms.mk for $(PLATFORM)_DESTDIR_BASE
-DFLT_INSTALL_DIR := $(MU_BUILD_ROOT_DIR)/$(INSTALL_PREFIX)$(ARCH)
-## BURT
 
 PLATFORM_IMAGE_DIR = $(MU_BUILD_ROOT_DIR)/$(IMAGES_PREFIX)$(PLATFORM)
 
@@ -313,12 +307,17 @@ endif
 
 # Always prefer our own tools to those installed on system.
 # Note: ccache-bin must be before tool bin.
+# 
+# Removed LD_LIBRARY_PATH from BUILD_ENV (drb, 10/31/17):  
+# export LD_LIBRARY_PATH=$(TOOL_INSTALL_DIR)/lib64:$(TOOL_INSTALL_DIR)/lib
+#   Reported to cause trouble. Only of historical interest, since we no longer
+#   build a full tool chain from source.
+
 BUILD_ENV =										\
     export CCACHE_DIR=$(CCACHE_DIR) ;					\
     export PATH=$(TOOL_INSTALL_DIR)/ccache-bin:$(TOOL_INSTALL_DIR)/bin:$${PATH} ;	\
     export PATH="`echo $${PATH} | sed -e s/[.]://`" ;					\
     $(if $(not_native),export CONFIG_SITE=$(MU_BUILD_ROOT_DIR)/config.site ;,)	\
-    export LD_LIBRARY_PATH=$(TOOL_INSTALL_DIR)/lib64:$(TOOL_INSTALL_DIR)/lib ;		\
     set -eu$(BUILD_DEBUG) ;							        \
     set -o pipefail
 
@@ -331,16 +330,6 @@ package_dir_fn = \
 
 package_mk_fn = $(call package_dir_fn,$(1))/$(1).mk
 
-### BURT
-
-#next version
-#pkgPhaseDependMacro = $(foreach x,configure build install,                  \
-			$(eval $(1)_$(x)_depend := $($(1)_depend:%=%-$(x))))
-#version equivalent to original code
-pkgPhaseDependMacro = $(eval $(1)_configure_depend := $($(1)_depend:%=%-install))
-
-### BURT
-
 # Pick up built-root/pre-package-include.mk for all source directories
 $(foreach d,$(SOURCE_PATH_BUILD_ROOT_DIRS),	\
   $(eval -include $(d)/pre-package-include.mk))
@@ -556,7 +545,6 @@ CONFIGURE_ENV =								\
 	 LDFLAGS="$(LDFLAGS) $(call configure_ldflags_fn)")		\
     $(if $($(PACKAGE)_configure_env),$($(PACKAGE)_configure_env))
 
-### BURT
 # only partially used now (used in a few .mk files)
 ifeq ($(is_build_tool),yes)
 prefix     = $(PACKAGE_INSTALL_DIR)
@@ -574,10 +562,6 @@ libexecdir = $($(PLATFORM)_LIBEXECDIR)
 destdirMacro  = $($(PLATFORM)_DESTDIR_BASE)$(ppdMacro)
 DESTDIR  = $(call destdirMacro,$(PACKAGE))
 endif
-### BURT
-### dbarach
-image_extra_dependencies = $($(PLATFORM)_image_extra_dependencies)
-### dbarach
 
 configure_package_gnu =						\
   s=$(call find_source_fn,$(PACKAGE_SOURCE))$(PACKAGE_SUBDIR) ;	\
-- 
2.16.6