From 62d81aadbaa95002c4fec70bc5dd7a45214966ca Mon Sep 17 00:00:00 2001 From: Nathan Zadoks Date: Mon, 29 Feb 2016 12:50:47 +0100 Subject: [PATCH 1/2] configure.ac: strip -musl in the same way as -gnu --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 3a24053bb..2a043ed13 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,7 @@ AC_ARG_WITH(system, AC_HELP_STRING([--with-system=SYSTEM], esac case "$host_os" in - linux-gnu*) + linux-gnu*|linux-musl*) # For backward compatibility, strip the `-gnu' part. system="$machine_name-linux";; *) From fe2be8f016474d9f073328f061ba5650002e9369 Mon Sep 17 00:00:00 2001 From: Nathan Zadoks Date: Mon, 29 Feb 2016 13:12:38 +0100 Subject: [PATCH 2/2] build.cc: fs.h doesn't appear to be necessary anymore --- src/libstore/build.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/src/libstore/build.cc b/src/libstore/build.cc index 547981e5b..7d124f6f0 100644 --- a/src/libstore/build.cc +++ b/src/libstore/build.cc @@ -52,7 +52,6 @@ #include #include #include -#include #define pivot_root(new_root, put_old) (syscall(SYS_pivot_root, new_root, put_old)) #endif