diff options
author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-04-16 00:52:15 +0200 |
---|---|---|
committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-04-16 00:52:15 +0200 |
commit | 2bd8fc9378a01ecf28d119fd86737d9c368bc620 (patch) | |
tree | 6fdeb5f753ae9a7c0fcb12162f06660987320bad /pkgs/build-support | |
parent | 9ada55cec55cd7a1db6ac7a3bb93140961cfeac0 (diff) | |
parent | d75710d82015b8ec2b11ba13fe23f9568ef76eb7 (diff) | |
download | nixpkgs-2bd8fc9378a01ecf28d119fd86737d9c368bc620.tar nixpkgs-2bd8fc9378a01ecf28d119fd86737d9c368bc620.tar.gz nixpkgs-2bd8fc9378a01ecf28d119fd86737d9c368bc620.tar.bz2 nixpkgs-2bd8fc9378a01ecf28d119fd86737d9c368bc620.tar.lz nixpkgs-2bd8fc9378a01ecf28d119fd86737d9c368bc620.tar.xz nixpkgs-2bd8fc9378a01ecf28d119fd86737d9c368bc620.tar.zst nixpkgs-2bd8fc9378a01ecf28d119fd86737d9c368bc620.zip |
Merge remote-tracking branch 'origin/master' into staging-next
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/setup-hooks/auto-patchelf.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.sh b/pkgs/build-support/setup-hooks/auto-patchelf.sh index 661b8597efe..b56f9ce2dbf 100644 --- a/pkgs/build-support/setup-hooks/auto-patchelf.sh +++ b/pkgs/build-support/setup-hooks/auto-patchelf.sh @@ -53,17 +53,18 @@ autoPatchelf() { esac done - if [ "${autoPatchelfIgnoreMissingDeps[*]}" == "1" ]; then + local ignoreMissingDepsArray=($autoPatchelfIgnoreMissingDeps) + if [ "$autoPatchelfIgnoreMissingDeps" == "1" ]; then echo "autoPatchelf: WARNING: setting 'autoPatchelfIgnoreMissingDeps" \ "= true;' is deprecated and will be removed in a future release." \ "Use 'autoPatchelfIgnoreMissingDeps = [ \"*\" ];' instead." >&2 - autoPatchelfIgnoreMissingDeps=( "*" ) + ignoreMissingDepsArray=( "*" ) fi local runtimeDependenciesArray=($runtimeDependencies) @pythonInterpreter@ @autoPatchelfScript@ \ ${norecurse:+--no-recurse} \ - --ignore-missing "${autoPatchelfIgnoreMissingDeps[@]}" \ + --ignore-missing "${ignoreMissingDepsArray[@]}" \ --paths "$@" \ --libs "${autoPatchelfLibs[@]}" \ "${extraAutoPatchelfLibs[@]}" \ |