diff options
| author | Leo Famulari <leo@famulari.name> | 2017-01-13 10:21:17 -0500 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2017-01-13 10:21:17 -0500 |
| commit | cc0725914e74c4c4dec369f3e7cdb6f201b3fecd (patch) | |
| tree | e68b452ed625a2db8ed10914fb0968fdc36c655d /gnu/packages/commencement.scm | |
| parent | a25b6880f1398ad36aea1d0e4e4105936a8b7e70 (diff) | |
| parent | ce195ba12277ec4286ad0d8ddf7294655987ea9d (diff) | |
| download | gnu-guix-cc0725914e74c4c4dec369f3e7cdb6f201b3fecd.tar gnu-guix-cc0725914e74c4c4dec369f3e7cdb6f201b3fecd.tar.gz | |
Merge branch 'master' into python-tests
Diffstat (limited to 'gnu/packages/commencement.scm')
| -rw-r--r-- | gnu/packages/commencement.scm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 2431babcad..7df1d3fca9 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -474,7 +474,7 @@ the bootstrap environment." (unsetenv "CPATH") ;; Tell 'libpthread' where to find 'libihash' on Hurd systems. - ,@(if (string-match "i586-gnu" (%current-system)) + ,@(if (hurd-triplet? (%current-system)) `((substitute* "libpthread/Makefile" (("LDLIBS-pthread.so =.*") (string-append "LDLIBS-pthread.so = " @@ -499,7 +499,7 @@ the bootstrap environment." ,@%boot1-inputs ;; A native MiG is needed to build Glibc on Hurd. - ,@(if (string-match "i586-gnu" (%current-system)) + ,@(if (hurd-triplet? (%current-system)) `(("mig" ,mig-boot0)) '()) @@ -783,6 +783,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" (define bash-final ;; Link with `-static-libgcc' to make sure we don't retain a reference ;; to the bootstrap GCC. + ;; FIXME: This depends on 'bootstrap-binaries' via Makefile.in. (package-with-bootstrap-guile (package-with-explicit-inputs (static-libgcc-package bash) %boot3-inputs |