diff options
author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2019-04-13 12:04:32 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-13 12:04:32 -0400 |
commit | 59c81160e7df5d5d1b143b1d2e46385debc6bfea (patch) | |
tree | 6357d03a315666055aebcda1da18751dbaae229a /pkgs/development/tools | |
parent | 14a008dba64ab32c677eee005d1cda3fe460b763 (diff) | |
parent | a79a8f29bc509b2d51158846c9562e64e1239b4c (diff) | |
download | nixlib-59c81160e7df5d5d1b143b1d2e46385debc6bfea.tar nixlib-59c81160e7df5d5d1b143b1d2e46385debc6bfea.tar.gz nixlib-59c81160e7df5d5d1b143b1d2e46385debc6bfea.tar.bz2 nixlib-59c81160e7df5d5d1b143b1d2e46385debc6bfea.tar.lz nixlib-59c81160e7df5d5d1b143b1d2e46385debc6bfea.tar.xz nixlib-59c81160e7df5d5d1b143b1d2e46385debc6bfea.tar.zst nixlib-59c81160e7df5d5d1b143b1d2e46385debc6bfea.zip |
Merge pull request #58504 from symphorien/static-proot
Static proot, wafHook cross compilation
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r-- | pkgs/development/tools/build-managers/waf/setup-hook.sh | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/pkgs/development/tools/build-managers/waf/setup-hook.sh b/pkgs/development/tools/build-managers/waf/setup-hook.sh index b8a448df8ef8..3da86d3201f5 100644 --- a/pkgs/development/tools/build-managers/waf/setup-hook.sh +++ b/pkgs/development/tools/build-managers/waf/setup-hook.sh @@ -1,20 +1,23 @@ wafConfigurePhase() { runHook preConfigure - if ! [ -f ./waf ]; then - cp @waf@ waf + if ! [ -f "${wafPath:=./waf}" ]; then + echo "copying waf to $wafPath..." + cp @waf@ "$wafPath" fi - if [[ -z "${dontAddPrefix:-}" && -n "$prefix" ]]; then - configureFlags="${prefixKey:---prefix=}$prefix $configureFlags" + if [ -z "${dontAddPrefix:-}" ] && [ -n "$prefix" ]; then + wafConfigureFlags="${prefixKey:---prefix=}$prefix $wafConfigureFlags" fi local flagsArray=( - $configureFlags ${configureFlagsArray[@]} + @crossFlags@ + "${flagsArray[@]}" + $wafConfigureFlags "${wafConfigureFlagsArray[@]}" ${configureTargets:-configure} ) echoCmd 'configure flags' "${flagsArray[@]}" - python waf "${flagsArray[@]}" + python "$wafPath" "${flagsArray[@]}" runHook postConfigure } @@ -33,7 +36,7 @@ wafBuildPhase () { ) echoCmd 'build flags' "${flagsArray[@]}" - python waf "${flagsArray[@]}" + python "$wafPath" "${flagsArray[@]}" runHook postBuild } @@ -52,7 +55,7 @@ wafInstallPhase() { ) echoCmd 'install flags' "${flagsArray[@]}" - python waf "${flagsArray[@]}" + python "$wafPath" "${flagsArray[@]}" runHook postInstall } |