From 2811b032d639684d3983282e9d10d89f37d161d5 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 31 Oct 2019 16:50:15 +0000 Subject: treewide: Make still dont* Variables are optional in most cases Go beyond the obvious setup hooks now, with a bit of sed, with a skipped case: - cc-wrapper's `dontlink`, because it already is handled. Also, in nix files escaping was manually added. EMP --- pkgs/stdenv/cygwin/rebase-i686.sh | 2 +- pkgs/stdenv/cygwin/rebase-x86_64.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/stdenv') diff --git a/pkgs/stdenv/cygwin/rebase-i686.sh b/pkgs/stdenv/cygwin/rebase-i686.sh index 091c9044d93..6b8ec441ca7 100644 --- a/pkgs/stdenv/cygwin/rebase-i686.sh +++ b/pkgs/stdenv/cygwin/rebase-i686.sh @@ -1,7 +1,7 @@ fixupOutputHooks+=(_cygwinFixAutoImageBase) _cygwinFixAutoImageBase() { - if [ "$dontRebase" == 1 ] || [ ! -d "$prefix" ]; then + if [ "${dontRebase-}" == 1 ] || [ ! -d "$prefix" ]; then return fi find "$prefix" -name "*.dll" -type f | while read DLL; do diff --git a/pkgs/stdenv/cygwin/rebase-x86_64.sh b/pkgs/stdenv/cygwin/rebase-x86_64.sh index 4c8f8ebd7eb..6dccdc40c72 100644 --- a/pkgs/stdenv/cygwin/rebase-x86_64.sh +++ b/pkgs/stdenv/cygwin/rebase-x86_64.sh @@ -1,7 +1,7 @@ fixupOutputHooks+=(_cygwinFixAutoImageBase) _cygwinFixAutoImageBase() { - if [ "$dontRebase" == 1 ] || [ ! -d "$prefix" ]; then + if [ "${dontRebase-}" == 1 ] || [ ! -d "$prefix" ]; then return fi find "$prefix" -name "*.dll" -type f | while read DLL; do -- cgit 1.4.1