From 5ce33a1833f4a1c4ff386e7a68fc8edafeaaf210 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Fri, 13 Aug 2021 21:02:13 +0000
Subject: [PATCH] Bug 1725566 - Remove unnecessary "library paths".
 r=taskgraph-reviewers,bhearsum

Differential Revision: https://phabricator.services.mozilla.com/D122573
---
 taskcluster/scripts/builder/build-haz-linux.sh  | 2 --
 taskcluster/scripts/builder/build-l10n.sh       | 3 ---
 taskcluster/scripts/builder/build-linux.sh      | 3 ---
 taskcluster/scripts/misc/build-llvm-dsymutil.sh | 2 --
 4 files changed, 10 deletions(-)

diff --git a/taskcluster/scripts/builder/build-haz-linux.sh b/taskcluster/scripts/builder/build-haz-linux.sh
index ad572876e6ee..ffa05715942c 100755
--- a/taskcluster/scripts/builder/build-haz-linux.sh
+++ b/taskcluster/scripts/builder/build-haz-linux.sh
@@ -177,8 +177,6 @@ trap grab_artifacts EXIT
 export HAZ_OBJDIR="$WORKSPACE/obj-analyzed-$PROJECT"
 mkdir -p "$HAZ_OBJDIR"
 
-export LD_LIBRARY_PATH="$MOZ_FETCHES_DIR/gcc/lib64:$LD_LIBRARY_PATH"
-
 # Gather the information from the source tree by compiling it.
 $GECKO_PATH/mach hazards gather --application=$PROJECT --haz-objdir="$HAZ_OBJDIR" --work-dir="$ANALYSIS_DIR"
 
diff --git a/taskcluster/scripts/builder/build-l10n.sh b/taskcluster/scripts/builder/build-l10n.sh
index 97e83971c4f1..4c4bee2f66bd 100755
--- a/taskcluster/scripts/builder/build-l10n.sh
+++ b/taskcluster/scripts/builder/build-l10n.sh
@@ -41,9 +41,6 @@ fail() {
 export MOZ_CRASHREPORTER_NO_REPORT=1
 export TINDERBOX_OUTPUT=1
 
-# Ensure that in tree libraries can be found
-export LIBRARY_PATH=$LIBRARY_PATH:$WORKSPACE/obj-build:$WORKSPACE/src/gcc/lib64
-
 # test required parameters are supplied
 if [[ -z ${MOZHARNESS_SCRIPT} ]]; then fail "MOZHARNESS_SCRIPT is not set"; fi
 if [[ -z "${MOZHARNESS_CONFIG}" && -z "${EXTRA_MOZHARNESS_CONFIG}" ]]; then fail "MOZHARNESS_CONFIG or EXTRA_MOZHARNESS_CONFIG is not set"; fi
diff --git a/taskcluster/scripts/builder/build-linux.sh b/taskcluster/scripts/builder/build-linux.sh
index aeb14f61805f..db501f1cace3 100755
--- a/taskcluster/scripts/builder/build-linux.sh
+++ b/taskcluster/scripts/builder/build-linux.sh
@@ -44,9 +44,6 @@ export TINDERBOX_OUTPUT=1
 # extras.locations
 export MOZ_SIMPLE_PACKAGE_NAME=target
 
-# Ensure that in tree libraries can be found
-export LIBRARY_PATH=$LIBRARY_PATH:$WORKSPACE/obj-build:$WORKSPACE/src/gcc/lib64
-
 # test required parameters are supplied
 if [[ -z ${MOZHARNESS_SCRIPT} ]]; then fail "MOZHARNESS_SCRIPT is not set"; fi
 if [[ -z "${MOZHARNESS_CONFIG}" && -z "${EXTRA_MOZHARNESS_CONFIG}" ]]; then fail "MOZHARNESS_CONFIG or EXTRA_MOZHARNESS_CONFIG is not set"; fi
diff --git a/taskcluster/scripts/misc/build-llvm-dsymutil.sh b/taskcluster/scripts/misc/build-llvm-dsymutil.sh
index aeafb6acf28b..e8c4a0331c87 100755
--- a/taskcluster/scripts/misc/build-llvm-dsymutil.sh
+++ b/taskcluster/scripts/misc/build-llvm-dsymutil.sh
@@ -17,8 +17,6 @@ cmake \
   -DCMAKE_C_COMPILER=$MOZ_FETCHES_DIR/gcc/bin/gcc \
   ..
 
-export LD_LIBRARY_PATH=$MOZ_FETCHES_DIR/gcc/lib64
-
 ninja dsymutil llvm-symbolizer
 
 tar --xform='s,^,llvm-dsymutil/,' -Jcf llvm-dsymutil.tar.xz bin/dsymutil bin/llvm-symbolizer