diff options
| author | Symphorien Gibol <symphorien+git@xlumurb.eu> | 2019-03-28 18:33:08 +0100 |
|---|---|---|
| committer | Symphorien Gibol <symphorien+git@xlumurb.eu> | 2019-03-28 18:33:08 +0100 |
| commit | f23a21514c99974307aff74946ce1150d5aa3653 (patch) | |
| tree | ca29697c3b99328f0f51a2714eec3e9edcbc5623 /pkgs/development/tools | |
| parent | f075de5c258ee9adfb300c8aee07125948b6f03d (diff) | |
| download | nixlib-f23a21514c99974307aff74946ce1150d5aa3653.tar nixlib-f23a21514c99974307aff74946ce1150d5aa3653.tar.gz nixlib-f23a21514c99974307aff74946ce1150d5aa3653.tar.bz2 nixlib-f23a21514c99974307aff74946ce1150d5aa3653.tar.lz nixlib-f23a21514c99974307aff74946ce1150d5aa3653.tar.xz nixlib-f23a21514c99974307aff74946ce1150d5aa3653.tar.zst nixlib-f23a21514c99974307aff74946ce1150d5aa3653.zip | |
wafHook: ignore --disable-static and such options
These options are forcefully added by pkgsStatic but are not understood by waf.
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/build-managers/waf/setup-hook.sh | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/pkgs/development/tools/build-managers/waf/setup-hook.sh b/pkgs/development/tools/build-managers/waf/setup-hook.sh index c1ff160982a0..01392c9a3423 100644 --- a/pkgs/development/tools/build-managers/waf/setup-hook.sh +++ b/pkgs/development/tools/build-managers/waf/setup-hook.sh @@ -10,8 +10,21 @@ wafConfigurePhase() { configureFlags="${prefixKey:---prefix=}$prefix $configureFlags" fi - local flagsArray=( - $configureFlags ${configureFlagsArray[@]} + local flagsArray=(); + for flag in $configureFlags "${configureFlagsArray[@]}"; + do + # waf does not support these flags, but they are "blindly" added by the + # pkgsStatic overlay, for example. + if [[ $flag != "--enable-static" + && $flag != "--disable-static" + && $flag != "--enable-shared" + && $flag != "--disable-shared" ]]; + then + flagsArray=("${flagsArray[@]}" "$flag"); + fi; + done + flagsArray=( + "${flagsArray[@]}" ${configureTargets:-configure} ) echoCmd 'configure flags' "${flagsArray[@]}" |