diff options
| author | Pierre Neidhardt <mail@ambrevar.xyz> | 2020-05-17 14:33:24 +0200 |
|---|---|---|
| committer | Pierre Neidhardt <mail@ambrevar.xyz> | 2020-05-17 14:36:27 +0200 |
| commit | da95ca97d4fce779cfeec2824c1aaa757fbd2009 (patch) | |
| tree | 16a08cfefb5ca782c344bfaa69ce013472b8059c /nonguix | |
| parent | c6e79750d730808b8d9745aca6da6cb2078c3e59 (diff) | |
nonguix: Set default build-inputs priority higher than libc32 in binary-build-system.
* nonguix/build-system/binary.scm (lower): Swap native-inputs and libc32 in
build-inputs. In particular, this fixes static linking with GCC.
Diffstat (limited to 'nonguix')
| -rw-r--r-- | nonguix/build-system/binary.scm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nonguix/build-system/binary.scm b/nonguix/build-system/binary.scm index 2ec1261..038bd89 100644 --- a/nonguix/build-system/binary.scm +++ b/nonguix/build-system/binary.scm @@ -82,10 +82,10 @@ ;; Keep the standard inputs of 'gnu-build-system'. ,@(standard-packages))) (build-inputs `(("patchelf" ,patchelf) + ,@native-inputs ;; If current system is i686, the *32 packages will be the ;; same as the non-32, but that's OK. - ("libc32" ,(to32 glibc)) - ,@native-inputs)) + ("libc32" ,(to32 glibc)))) (outputs outputs) (build binary-build) (arguments (strip-keyword-arguments private-keywords arguments))))) |