JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #69603 from matthewbauer/unset-unused-setup-var

Browse Source 
Unset unused variables in setup.sh
This commit is contained in:
Matthew Bauer 2019-11-05 14:43:11 -05:00 committed by GitHub
commit 9ffedfef81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pkgs/stdenv/generic/setup.sh
View File

@ -248,6 +248,8 @@ for i in $initialPath; do
fi fi
done done
unset i
if (( "${NIX_DEBUG:-0}" >= 1 )); then if (( "${NIX_DEBUG:-0}" >= 1 )); then
echo "initial path: $PATH" echo "initial path: $PATH"
fi fi
@ -277,11 +279,11 @@ declare -a pkgsBuildBuild pkgsBuildHost pkgsBuildTarget
declare -a pkgsHostHost pkgsHostTarget declare -a pkgsHostHost pkgsHostTarget
declare -a pkgsTargetTarget declare -a pkgsTargetTarget
declare -ra pkgBuildAccumVars=(pkgsBuildBuild pkgsBuildHost pkgsBuildTarget) declare -a pkgBuildAccumVars=(pkgsBuildBuild pkgsBuildHost pkgsBuildTarget)
declare -ra pkgHostAccumVars=(pkgsHostHost pkgsHostTarget) declare -a pkgHostAccumVars=(pkgsHostHost pkgsHostTarget)
declare -ra pkgTargetAccumVars=(pkgsTargetTarget) declare -a pkgTargetAccumVars=(pkgsTargetTarget)
declare -ra pkgAccumVarVars=(pkgBuildAccumVars pkgHostAccumVars pkgTargetAccumVars) declare -a pkgAccumVarVars=(pkgBuildAccumVars pkgHostAccumVars pkgTargetAccumVars)
# Hooks # Hooks
@ -290,11 +292,11 @@ declare -a envBuildBuildHooks envBuildHostHooks envBuildTargetHooks
declare -a envHostHostHooks envHostTargetHooks declare -a envHostHostHooks envHostTargetHooks
declare -a envTargetTargetHooks declare -a envTargetTargetHooks
declare -ra pkgBuildHookVars=(envBuildBuildHook envBuildHostHook envBuildTargetHook) declare -a pkgBuildHookVars=(envBuildBuildHook envBuildHostHook envBuildTargetHook)
declare -ra pkgHostHookVars=(envHostHostHook envHostTargetHook) declare -a pkgHostHookVars=(envHostHostHook envHostTargetHook)
declare -ra pkgTargetHookVars=(envTargetTargetHook) declare -a pkgTargetHookVars=(envTargetTargetHook)
declare -ra pkgHookVarVars=(pkgBuildHookVars pkgHostHookVars pkgTargetHookVars) declare -a pkgHookVarVars=(pkgBuildHookVars pkgHostHookVars pkgTargetHookVars)
# Add env hooks for all sorts of deps with the specified host offset. # Add env hooks for all sorts of deps with the specified host offset.
addEnvHooks() { addEnvHooks() {
@ -310,26 +312,26 @@ addEnvHooks() {
# Propagated dep files # Propagated dep files
declare -ra propagatedBuildDepFiles=( declare -a propagatedBuildDepFiles=(
propagated-build-build-deps propagated-build-build-deps
propagated-native-build-inputs # Legacy name for back-compat propagated-native-build-inputs # Legacy name for back-compat
propagated-build-target-deps propagated-build-target-deps
) )
declare -ra propagatedHostDepFiles=( declare -a propagatedHostDepFiles=(
propagated-host-host-deps propagated-host-host-deps
propagated-build-inputs # Legacy name for back-compat propagated-build-inputs # Legacy name for back-compat
) )
declare -ra propagatedTargetDepFiles=( declare -a propagatedTargetDepFiles=(
propagated-target-target-deps propagated-target-target-deps
) )
declare -ra propagatedDepFilesVars=( declare -a propagatedDepFilesVars=(
propagatedBuildDepFiles propagatedBuildDepFiles
propagatedHostDepFiles propagatedHostDepFiles
propagatedTargetDepFiles propagatedTargetDepFiles
) )
# Platform offsets: build = -1, host = 0, target = 1 # Platform offsets: build = -1, host = 0, target = 1
declare -ra allPlatOffsets=(-1 0 1) declare -a allPlatOffsets=(-1 0 1)
# Mutually-recursively find all build inputs. See the dependency section of the # Mutually-recursively find all build inputs. See the dependency section of the
@ -569,6 +571,13 @@ _addToEnv() {
_addToEnv _addToEnv
# Unset setup-specific declared variables
unset allPlatOffsets
unset pkgBuildAccumVars pkgHostAccumVars pkgTargetAccumVars pkgAccumVarVars
unset pkgBuildHookVars pkgHostHookVars pkgTargetHookVars pkgHookVarVars
unset propagatedBuildDepFiles propagatedHostDepFiles propagatedTargetDepFiles propagatedDepFilesVars
_addRpathPrefix "$out" _addRpathPrefix "$out"