diff options
author | Marius Bakke <marius@gnu.org> | 2020-11-07 21:33:32 +0100 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2020-11-07 21:33:32 +0100 |
commit | 32787d652460871a79f99b63230f92759e2e0de2 (patch) | |
tree | ce883cac0d602b10b7c005755d035a08197e73a9 /gnu/packages/acl.scm | |
parent | 052939c2f6e36de00a5e756ea29a4cc96884a55d (diff) | |
parent | c2396ceb6eb30ac87755eb8b39583403b35fbd12 (diff) | |
download | guix-patches-32787d652460871a79f99b63230f92759e2e0de2.tar guix-patches-32787d652460871a79f99b63230f92759e2e0de2.tar.gz |
Merge branch 'master' into staging
Conflicts:
gnu/local.mk
gnu/packages/gdb.scm
gnu/packages/lisp-xyz.scm
gnu/packages/web-browsers.scm
Diffstat (limited to 'gnu/packages/acl.scm')
-rw-r--r-- | gnu/packages/acl.scm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu/packages/acl.scm b/gnu/packages/acl.scm index 4e90703d81..be4b079b04 100644 --- a/gnu/packages/acl.scm +++ b/gnu/packages/acl.scm @@ -51,7 +51,8 @@ `(#:modules ((ice-9 ftw) ,@%gnu-build-system-modules) #:configure-flags '("--disable-static") - #:tests? ,(not (hurd-target?)) + #:tests? ,(not (or (%current-target-system) + (hurd-target?))) #:phases (modify-phases %standard-phases ;; XXX After repacking the sources the timestamps are reset to the |