From 2a699fe5fb15cd68473f59d986059bdb92228b75 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 21 Apr 2009 22:40:12 +0000 Subject: [PATCH] * Pass --disable-static to configure by default it it's supported. svn path=/nixpkgs/branches/stdenv-updates/; revision=15234 --- pkgs/stdenv/generic/setup.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 43fa69b224b..372bff1eae1 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -548,6 +548,13 @@ configurePhase() { fi fi + # By default, disable static builds. + if test -z "$dontDisableStatic"; then + if grep -q enable-static $configureScript; then + configureFlags="--disable-static $configureFlags" + fi + fi + echo "configure flags: $configureFlags ${configureFlagsArray[@]}" $configureScript $configureFlags "${configureFlagsArray[@]}"