diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-03-03T15·05+0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-03-03T15·05+0100 |
| commit | 0a26b56cba5d9f1fa815273fadc500284dda1118 (patch) | |
| tree | 0cfa7a6d223fd20b129620f23b5db4de802e9b87 | |
| parent | e9c50064b59de6e9b4167f578c15b0cc04a7d33e (diff) | |
| parent | fe2be8f016474d9f073328f061ba5650002e9369 (diff) | |
Merge pull request #827 from nathan7/musl
musl compatibility
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/libstore/build.cc | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 3a24053bb6a1..2a043ed13922 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";; *) diff --git a/src/libstore/build.cc b/src/libstore/build.cc index 547981e5bb01..7d124f6f0ee0 100644 --- a/src/libstore/build.cc +++ b/src/libstore/build.cc @@ -52,7 +52,6 @@ #include <sys/param.h> #include <sys/mount.h> #include <sys/syscall.h> -#include <linux/fs.h> #define pivot_root(new_root, put_old) (syscall(SYS_pivot_root, new_root, put_old)) #endif |