diff options
| author | Andrew Childs <lorne@cons.org.nz> | 2020-02-09 15:53:46 +0900 |
|---|---|---|
| committer | Andrew Childs <lorne@cons.org.nz> | 2020-02-09 16:03:02 +0900 |
| commit | 032d5e7e837eaa295f2afec87a39a4ced2c1bc97 (patch) | |
| tree | c493f4b036d044e6372b17d6d0c2c520895efa71 /pkgs/development/tools/build-managers | |
| parent | c6791b211767e8f4e4b1e90bc61b42b814f2e920 (diff) | |
| download | nixpkgs-032d5e7e837eaa295f2afec87a39a4ced2c1bc97.tar nixpkgs-032d5e7e837eaa295f2afec87a39a4ced2c1bc97.tar.gz nixpkgs-032d5e7e837eaa295f2afec87a39a4ced2c1bc97.tar.bz2 nixpkgs-032d5e7e837eaa295f2afec87a39a4ced2c1bc97.tar.lz nixpkgs-032d5e7e837eaa295f2afec87a39a4ced2c1bc97.tar.xz nixpkgs-032d5e7e837eaa295f2afec87a39a4ced2c1bc97.tar.zst nixpkgs-032d5e7e837eaa295f2afec87a39a4ced2c1bc97.zip | |
wafHook: make crossFlags optional
The convention of `--cross-compile` and `--cross-execute` is common enough that it seems like a reasonable default. However there are projects like mpv which do not use these flags, and rightfully fails to configure when passed unexpected flags.
Diffstat (limited to 'pkgs/development/tools/build-managers')
| -rw-r--r-- | pkgs/development/tools/build-managers/wafHook/setup-hook.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/tools/build-managers/wafHook/setup-hook.sh b/pkgs/development/tools/build-managers/wafHook/setup-hook.sh index 0cce57677bd..a9496b76b21 100644 --- a/pkgs/development/tools/build-managers/wafHook/setup-hook.sh +++ b/pkgs/development/tools/build-managers/wafHook/setup-hook.sh @@ -11,11 +11,13 @@ wafConfigurePhase() { fi local flagsArray=( - @crossFlags@ "${flagsArray[@]}" $wafConfigureFlags "${wafConfigureFlagsArray[@]}" ${configureTargets:-configure} ) + if [ -z "${dontAddWafCrossFlags:-}" ]; then + flagsArray+=(@crossFlags@) + fi echoCmd 'configure flags' "${flagsArray[@]}" python "$wafPath" "${flagsArray[@]}" |