summary refs log tree commit diff
path: root/pkgs/build-support
diff options
context:
space:
mode:
authorhappysalada <raphael@megzari.com>2021-06-28 22:44:01 +0900
committerRaphael Megzari <raphael@megzari.com>2021-07-06 09:27:18 +0900
commit6d52db43d4a65857eadcd51596aa29e7b5e24102 (patch)
treeb0d4be40bd76461cf3b849db5664751df28f0339 /pkgs/build-support
parent06688b73ca661c0d7daa09355abc10c694164943 (diff)
downloadnixpkgs-6d52db43d4a65857eadcd51596aa29e7b5e24102.tar
nixpkgs-6d52db43d4a65857eadcd51596aa29e7b5e24102.tar.gz
nixpkgs-6d52db43d4a65857eadcd51596aa29e7b5e24102.tar.bz2
nixpkgs-6d52db43d4a65857eadcd51596aa29e7b5e24102.tar.lz
nixpkgs-6d52db43d4a65857eadcd51596aa29e7b5e24102.tar.xz
nixpkgs-6d52db43d4a65857eadcd51596aa29e7b5e24102.tar.zst
nixpkgs-6d52db43d4a65857eadcd51596aa29e7b5e24102.zip
setup-hook.sh: use eval for dynamic variable export
Diffstat (limited to 'pkgs/build-support')
-rw-r--r--pkgs/build-support/bintools-wrapper/setup-hook.sh9
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/build-support/bintools-wrapper/setup-hook.sh b/pkgs/build-support/bintools-wrapper/setup-hook.sh
index 7e9547b96c2..ba09d19b1f2 100644
--- a/pkgs/build-support/bintools-wrapper/setup-hook.sh
+++ b/pkgs/build-support/bintools-wrapper/setup-hook.sh
@@ -1,3 +1,4 @@
+# shellcheck shell=bash
 # Binutils Wrapper hygiene
 #
 # See comments in cc-wrapper's setup hook. This works exactly the same way.
@@ -14,7 +15,9 @@ bintoolsWrapper_addLDVars () {
     getHostRoleEnvHook
 
     if [[ -d "$1/lib64" && ! -L "$1/lib64" ]]; then
-        export NIX_LDFLAGS${role_post}+=" -L$1/lib64"
+        varName=NIX_LDFLAGS${role_post}
+        eval "$varName=\"${!varName:-} -L$1/lib64\""
+        export "${varName?}"
     fi
 
     if [[ -d "$1/lib" ]]; then
@@ -24,7 +27,9 @@ bintoolsWrapper_addLDVars () {
         # directories and bloats the size of the environment variable space.
         local -a glob=( $1/lib/lib* )
         if [ "${#glob[*]}" -gt 0 ]; then
-            export NIX_LDFLAGS${role_post}+=" -L$1/lib"
+            varName=NIX_LDFLAGS${role_post}
+            eval "$varName=\"${!varName:-} -L$1/lib\""
+            export "${varName?}"
         fi
     fi
 }