mbakke pushed a commit to branch staging
in repository guix.
commit cb4b508cd68df89bfbd5255a0c5569f8318ad50f
Author: Marius Bakke <[email protected]>
Date: Mon Jul 2 12:07:58 2018 +0200
build-system/meson: Really skip the 'fix-runpath' phase on armhf.
This follows up commit d5b5a15a4046362377f1a45d466b43bb6e93d4f which doesn't
work because %current-system etc expands before the actual build.
Fixes <https://bugs.gnu.org/31719>.
* guix/build-system/meson.scm (meson-build)[builder]: Compare against the
already existing "system" variable rather than (%current-system).
---
guix/build-system/meson.scm | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm
index 529a2b8..e894e14 100644
--- a/guix/build-system/meson.scm
+++ b/guix/build-system/meson.scm
@@ -148,8 +148,7 @@ has a 'meson.build' file."
#:search-paths ',(map search-path-specification->sexp
search-paths)
#:phases
- (if (string-prefix? "arm" ,(or (%current-target-system)
- (%current-system)))
+ (if (string-prefix? "arm" ,system)
(modify-phases build-phases (delete 'fix-runpath))
build-phases)
#:configure-flags ,configure-flags
