From 45f6008817772c4f1bd9612e5d41e748d706803d Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 7 Feb 2013 14:03:23 -0500 Subject: [PATCH] cmake setup hook: If configurePhase is set, don't override it --- pkgs/development/tools/build-managers/cmake/setup-hook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index 32e0b76f608a..0a47ee6aa990 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" ]; then +if [ -z "$dontUseCmakeConfigure" -a ! -v configurePhase ]; then configurePhase=cmakeConfigurePhase fi