diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2018-03-22 20:32:48 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2018-03-22 20:33:08 +0200 |
| commit | 919034068ecca6cd16b110fa44246bfe758f984e (patch) | |
| tree | 1f074f5e29694c6bff498d551536d24617281b6d | |
| parent | 3a7597e4147235781d43ba9cef7a52ced9ea5e7a (diff) | |
| download | guix-919034068ecca6cd16b110fa44246bfe758f984e.tar guix-919034068ecca6cd16b110fa44246bfe758f984e.tar.gz | |
Revert "build-system/meson: Use 'target-arm32?' for armhf-linux case."
This reverts commit 3a7597e4147235781d43ba9cef7a52ced9ea5e7a.
| -rw-r--r-- | guix/build-system/meson.scm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm index 88a7b58286..529a2b8b0f 100644 --- a/guix/build-system/meson.scm +++ b/guix/build-system/meson.scm @@ -86,7 +86,8 @@ ;; to avoid superfluous entries in RUNPATH as described ;; in <https://bugs.gnu.org/28444#46>, so armhf may now ;; have different runtime dependencies from other arches. - ,@(if (not (target-arm32?)) + ,@(if (not (string-prefix? "arm" (or (%current-target-system) + (%current-system)))) `(("patchelf" ,(default-patchelf))) '()) ,@native-inputs)) @@ -147,7 +148,8 @@ has a 'meson.build' file." #:search-paths ',(map search-path-specification->sexp search-paths) #:phases - (if (target-arm32?) + (if (string-prefix? "arm" ,(or (%current-target-system) + (%current-system))) (modify-phases build-phases (delete 'fix-runpath)) build-phases) #:configure-flags ,configure-flags |