diff options
| author | Tmplt <tmplt@dragons.rocks> | 2019-11-17 23:33:37 +0100 |
|---|---|---|
| committer | Tmplt <tmplt@dragons.rocks> | 2019-11-17 23:33:37 +0100 |
| commit | 95692734b05d0caa42c91b1446e18e8c82ce0a58 (patch) | |
| tree | d333422b692b2a5273d73f87704bdc305fc9a0b1 /pkgs/development/tools/misc | |
| parent | 800f280696d54d718ec78684fd517cce472dedca (diff) | |
| parent | 9daa5b7a6d62b69f59017ce7c4f9eb2b0798be1b (diff) | |
Merge remote-tracking branch 'upstream/staging' into wrap-gdb
Diffstat (limited to 'pkgs/development/tools/misc')
| -rw-r--r-- | pkgs/development/tools/misc/patchelf/setup-hook.sh | 2 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/premake/setup-hook.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/tools/misc/patchelf/setup-hook.sh b/pkgs/development/tools/misc/patchelf/setup-hook.sh index bc1cddd4879c2..576b9ca2103ec 100644 --- a/pkgs/development/tools/misc/patchelf/setup-hook.sh +++ b/pkgs/development/tools/misc/patchelf/setup-hook.sh @@ -2,7 +2,7 @@ # directories from the RPATH of every library or executable in every # output. -fixupOutputHooks+=('if [ -z "$dontPatchELF" ]; then patchELF "$prefix"; fi') +fixupOutputHooks+=('if [ -z "${dontPatchELF-}" ]; then patchELF "$prefix"; fi') patchELF() { local dir="$1" diff --git a/pkgs/development/tools/misc/premake/setup-hook.sh b/pkgs/development/tools/misc/premake/setup-hook.sh index ba06ea2c76179..6e65e9e8c73f1 100644 --- a/pkgs/development/tools/misc/premake/setup-hook.sh +++ b/pkgs/development/tools/misc/premake/setup-hook.sh @@ -14,6 +14,6 @@ premakeConfigurePhase() { runHook postConfigure } -if [ -z "$configurePhase" ]; then +if [ -z "${configurePhase-}" ]; then configurePhase=premakeConfigurePhase fi |