diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-11-09 22:28:04 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-11-09 23:04:14 +0100 |
| commit | 929c365ad02a50a6b612866d7700e01e62e3fdd6 (patch) | |
| tree | 7b78bb399374981a9bd0fbb2c242fdf80e94eb7f | |
| parent | 0c72a719efee667c7d3eba1c74c357838fc84efa (diff) | |
gnu: make-bootstrap: Slightly clarify 'package-with-relocatable-glibc'.
* gnu/packages/make-bootstrap.scm (package-with-relocatable-glibc)
[cross-bootstrap-libc]: Take an explicit 'target' argument. Remove
redundant 'parameterize' form.
[inputs, native-inputs]: Adjust accordingly.
| -rw-r--r-- | gnu/packages/make-bootstrap.scm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 4e6be3270aa..b8d1b2af3e5 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm | |||
| @@ -125,19 +125,19 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." | |||
| 125 | "Return a variant of P that uses the libc as defined by | 125 | "Return a variant of P that uses the libc as defined by |
| 126 | `glibc-for-bootstrap'." | 126 | `glibc-for-bootstrap'." |
| 127 | 127 | ||
| 128 | (define (cross-bootstrap-libc) | 128 | (define (cross-bootstrap-libc target) |
| 129 | (let ((target (%current-target-system))) | 129 | (glibc-for-bootstrap |
| 130 | (glibc-for-bootstrap | 130 | ;; `cross-libc' already returns a cross libc, so clear |
| 131 | ;; `cross-libc' already returns a cross libc, so clear | 131 | ;; %CURRENT-TARGET-SYSTEM. |
| 132 | ;; %CURRENT-TARGET-SYSTEM. | 132 | (parameterize ((%current-target-system #f)) |
| 133 | (parameterize ((%current-target-system #f)) | 133 | (cross-libc target)))) |
| 134 | (cross-libc target))))) | ||
| 135 | 134 | ||
| 136 | ;; Standard inputs with the above libc and corresponding GCC. | 135 | ;; Standard inputs with the above libc and corresponding GCC. |
| 137 | 136 | ||
| 138 | (define (inputs) | 137 | (define (inputs) |
| 139 | (if (%current-target-system) ; is this package cross built? | 138 | (if (%current-target-system) ; is this package cross built? |
| 140 | `(("cross-libc" ,(cross-bootstrap-libc))) | 139 | `(("cross-libc" |
| 140 | ,(cross-bootstrap-libc (%current-target-system)))) | ||
| 141 | '())) | 141 | '())) |
| 142 | 142 | ||
| 143 | (define (native-inputs) | 143 | (define (native-inputs) |
| @@ -146,7 +146,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." | |||
| 146 | (xgcc (cross-gcc | 146 | (xgcc (cross-gcc |
| 147 | target | 147 | target |
| 148 | #:xbinutils (cross-binutils target) | 148 | #:xbinutils (cross-binutils target) |
| 149 | #:libc (cross-bootstrap-libc)))) | 149 | #:libc (cross-bootstrap-libc target)))) |
| 150 | `(("cross-gcc" ,(package | 150 | `(("cross-gcc" ,(package |
| 151 | (inherit xgcc) | 151 | (inherit xgcc) |
| 152 | (search-paths | 152 | (search-paths |
