diff options
| author | Danny Milosavljevic <dannym@scratchpost.org> | 2018-03-08 00:39:58 +0100 |
|---|---|---|
| committer | Danny Milosavljevic <dannym@scratchpost.org> | 2018-03-08 01:41:20 +0100 |
| commit | e7988175d9a3871315fe83b9824b1be56bb18e5a (patch) | |
| tree | e09c6138ea1e9f8204396428106f24d1091ab75d /gnu/packages/admin.scm | |
| parent | f43857d65d35ba90cfe675d8e44ef05a0a593a4d (diff) | |
| download | guix-e7988175d9a3871315fe83b9824b1be56bb18e5a.tar guix-e7988175d9a3871315fe83b9824b1be56bb18e5a.tar.gz | |
gnu: sunxi-tools: Improve build error reporting.
* gnu/packages/admin.scm (sunxi-tools)[arguments]<#:phases>[set-environment-up]:
Improve build error reporting.
Diffstat (limited to 'gnu/packages/admin.scm')
| -rw-r--r-- | gnu/packages/admin.scm | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 9116835d04..b35fd8fdd4 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2080,25 +2080,34 @@ Kerberos and Heimdal and FAST is supported with recent MIT Kerberos.") (lambda* (#:key make-flags #:allow-other-keys) (define (cross? x) (string-contains x "cross-arm-linux")) + (define (filter-environment! filter-predicate + environment-variable-names) + (for-each + (lambda (env-name) + (let* ((env-value (getenv env-name)) + (search-path (search-path-as-string->list env-value)) + (new-search-path (filter filter-predicate + search-path)) + (new-env-value (list->search-path-as-string + new-search-path ":"))) + (setenv env-name new-env-value))) + environment-variable-names)) (setenv "CROSS_C_INCLUDE_PATH" (getenv "C_INCLUDE_PATH")) (setenv "CROSS_CPLUS_INCLUDE_PATH" (getenv "CPLUS_INCLUDE_PATH")) (setenv "CROSS_LIBRARY_PATH" (getenv "LIBRARY_PATH")) - (for-each - (lambda (env-name) - (let* ((env-value (getenv env-name)) - (search-path (search-path-as-string->list env-value)) - (new-search-path (filter (lambda (e) (not (cross? e))) - search-path)) - (new-env-value (list->search-path-as-string - new-search-path ":"))) - (setenv env-name new-env-value))) - '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH" "LIBRARY_PATH")) + (filter-environment! cross? + '("CROSS_C_INCLUDE_PATH" "CROSS_CPLUS_INCLUDE_PATH" + "CROSS_LIBRARY_PATH")) + (filter-environment! (lambda (e) (not (cross? e))) + '("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH" + "LIBRARY_PATH")) #t)) (replace 'build (lambda* (#:key make-flags #:allow-other-keys) (zero? (apply system* "make" "tools" "misc" make-flags)))) (add-after 'build 'build-armhf (lambda* (#:key make-flags #:allow-other-keys) + (setenv "LIBRARY_PATH" #f) (zero? (apply system* "make" "target-tools" make-flags)))) (replace 'install (lambda* (#:key make-flags #:allow-other-keys) |