diff options
| author | Albert Safin <xzfcpw@gmail.com> | 2019-09-19 09:48:15 +0000 |
|---|---|---|
| committer | Albert Safin <xzfcpw@gmail.com> | 2019-09-20 02:45:52 +0000 |
| commit | d53920a5beb19541ce61107844ab2f5e27c19b44 (patch) | |
| tree | d554a8b661fe8c08f650bd6515c59763bb4a1468 /pkgs/stdenv | |
| parent | 6f024f6e6517d052221e6e1d3383ec326f04aeae (diff) | |
| download | nixpkgs-d53920a5beb19541ce61107844ab2f5e27c19b44.tar nixpkgs-d53920a5beb19541ce61107844ab2f5e27c19b44.tar.gz nixpkgs-d53920a5beb19541ce61107844ab2f5e27c19b44.tar.bz2 nixpkgs-d53920a5beb19541ce61107844ab2f5e27c19b44.tar.lz nixpkgs-d53920a5beb19541ce61107844ab2f5e27c19b44.tar.xz nixpkgs-d53920a5beb19541ce61107844ab2f5e27c19b44.tar.zst nixpkgs-d53920a5beb19541ce61107844ab2f5e27c19b44.zip | |
setup.sh: avoid subshells: mapOffset
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/generic/setup.sh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 60067a4051d..7e7f8739845 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -403,6 +403,7 @@ findInputs() { # The current package's host and target offset together # provide a <=-preserving homomorphism from the relative # offsets to current offset + local -i mapOffsetResult function mapOffset() { local -ri inputOffset="$1" if (( "$inputOffset" <= 0 )); then @@ -410,7 +411,7 @@ findInputs() { else local -ri outputOffset="$inputOffset - 1 + $targetOffset" fi - echo "$outputOffset" + mapOffsetResult="$outputOffset" } # Host offset relative to that of the package whose immediate @@ -422,8 +423,8 @@ findInputs() { # Host offset relative to the package currently being # built---as absolute an offset as will be used. - local -i hostOffsetNext - hostOffsetNext="$(mapOffset relHostOffset)" + mapOffset relHostOffset + local -i hostOffsetNext="$mapOffsetResult" # Ensure we're in bounds relative to the package currently # being built. @@ -441,8 +442,8 @@ findInputs() { # Target offset relative to the package currently being # built. - local -i targetOffsetNext - targetOffsetNext="$(mapOffset relTargetOffset)" + mapOffset relTargetOffset + local -i targetOffsetNext="$mapOffsetResult" # Once again, ensure we're in bounds relative to the # package currently being built. |