diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-03-09 16:35:41 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-03-09 16:35:41 +0100 |
| commit | e90e0fad1b3ba79d81f02424e143ee6f4f736e8b (patch) | |
| tree | 2c26190fd9114199b0ef79303e18a61100cab4af /build-aux | |
| parent | 8ea0700d231a8819fc7e8332e9685f0ce15c174e (diff) | |
| parent | 9ec2a4d3fec44f08a55df9f5f3d1a04b83e7fcf6 (diff) | |
| download | guix-e90e0fad1b3ba79d81f02424e143ee6f4f736e8b.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/hydra/gnu-system.scm | 7 | ||||
| -rw-r--r-- | build-aux/pre-inst-env.in | 15 |
2 files changed, 16 insertions, 6 deletions
diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm index 53fa637f14..a4893f198c 100644 --- a/build-aux/hydra/gnu-system.scm +++ b/build-aux/hydra/gnu-system.scm @@ -259,14 +259,17 @@ valid." ;; prevents known-to-fail cross-builds from i686-linux or armhf-linux to ;; mips64el-linux-gnuabi64. (and (or (string-prefix? "i686-" system) + (string-prefix? "i586-" system) (string-prefix? "armhf-" system)) - (string-suffix? "64" target))) + (string-contains target "64"))) ;x86_64, mips64el, aarch64, etc. (define (same? target) ;; Return true if SYSTEM and TARGET are the same thing. This is so we ;; don't try to cross-compile to 'mips64el-linux-gnu' from ;; 'mips64el-linux'. - (string-contains target system)) + (or (string-contains target system) + (and (string-prefix? "armhf" system) ;armhf-linux + (string-prefix? "arm" target)))) ;arm-linux-gnueabihf (define (pointless? target) ;; Return #t if it makes no sense to cross-build to TARGET from SYSTEM. diff --git a/build-aux/pre-inst-env.in b/build-aux/pre-inst-env.in index fe56da6944..dca2699687 100644 --- a/build-aux/pre-inst-env.in +++ b/build-aux/pre-inst-env.in @@ -1,7 +1,7 @@ #!/bin/sh # GNU Guix --- Functional package management for GNU -# Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> +# Copyright © 2012, 2013, 2014, 2015, 2017 Ludovic Courtès <ludo@gnu.org> # # This file is part of GNU Guix. # @@ -45,11 +45,18 @@ export PATH NIX_ROOT_FINDER="$abs_top_builddir/nix/scripts/list-runtime-roots" NIX_SUBSTITUTERS="$abs_top_builddir/nix/scripts/substitute" -NIX_BUILD_HOOK="$abs_top_builddir/nix/scripts/offload" NIX_LIBEXEC_DIR="@abs_top_builddir@/nix/scripts" # for 'guix-authenticate' -export NIX_ROOT_FINDER NIX_SUBSTITUTERS \ - NIX_BUILD_HOOK NIX_LIBEXEC_DIR +export NIX_ROOT_FINDER NIX_SUBSTITUTERS NIX_LIBEXEC_DIR + +NIX_BUILD_HOOK="$abs_top_builddir/nix/scripts/offload" +if [ -x "$NIX_BUILD_HOOK" ] +then + export NIX_BUILD_HOOK +else + # No offloading support. + unset NIX_BUILD_HOOK +fi # The 'guix-register' program. GUIX_REGISTER="$abs_top_builddir/guix-register" |