diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-08-09 23:14:01 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-08-09 23:14:01 +0200 |
| commit | 0acc4e6b2688516f233853c6cc80abd7217c90ef (patch) | |
| tree | 1354a402e8a8afc12fbd1483cbfccb76732ada5a /pkgs/development/tools/build-managers/cmake | |
| parent | 7926b587c320d8f56d92664a29216bb75ce45a65 (diff) | |
| download | nixlib-0acc4e6b2688516f233853c6cc80abd7217c90ef.tar nixlib-0acc4e6b2688516f233853c6cc80abd7217c90ef.tar.gz nixlib-0acc4e6b2688516f233853c6cc80abd7217c90ef.tar.bz2 nixlib-0acc4e6b2688516f233853c6cc80abd7217c90ef.tar.lz nixlib-0acc4e6b2688516f233853c6cc80abd7217c90ef.tar.xz nixlib-0acc4e6b2688516f233853c6cc80abd7217c90ef.tar.zst nixlib-0acc4e6b2688516f233853c6cc80abd7217c90ef.zip | |
cmake: Fix setup hook on bash < 4.0
This matters in nix-shell and stdenvNative on Darwin. Fixes #3204.
Diffstat (limited to 'pkgs/development/tools/build-managers/cmake')
| -rwxr-xr-x | pkgs/development/tools/build-managers/cmake/setup-hook.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index abc0b070a764..39052fea6cb5 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -47,7 +47,7 @@ cmakeConfigurePhase() { eval "$postConfigure" } -if [ -z "$dontUseCmakeConfigure" -a ! -v configurePhase ]; then +if [ -z "$dontUseCmakeConfigure" -a -z "$configurePhase" ]; then configurePhase=cmakeConfigurePhase fi |