Repository: mesos Updated Branches: refs/heads/master ac184f940 -> dcf88243e
Fixed failing build on OSX. Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/dcf88243 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/dcf88243 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/dcf88243 Branch: refs/heads/master Commit: dcf88243e1c85254e4452103714c830c3c174921 Parents: ac184f9 Author: Timothy Chen <[email protected]> Authored: Thu Nov 5 22:26:35 2015 -0800 Committer: Timothy Chen <[email protected]> Committed: Thu Nov 5 22:27:31 2015 -0800 ---------------------------------------------------------------------- src/Makefile.am | 2 +- src/slave/containerizer/mesos/mount.cpp | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/dcf88243/src/Makefile.am ---------------------------------------------------------------------- diff --git a/src/Makefile.am b/src/Makefile.am index b92ba15..f071538 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -545,6 +545,7 @@ libmesos_no_3rdparty_la_SOURCES = \ slave/containerizer/launcher.cpp \ slave/containerizer/mesos/containerizer.cpp \ slave/containerizer/mesos/launch.cpp \ + slave/containerizer/mesos/mount.cpp \ slave/containerizer/mesos/isolators/filesystem/posix.cpp \ slave/containerizer/mesos/isolators/posix/disk.cpp \ slave/containerizer/mesos/provisioner/paths.cpp \ @@ -732,7 +733,6 @@ if OS_LINUX libmesos_no_3rdparty_la_SOURCES += linux/perf.cpp libmesos_no_3rdparty_la_SOURCES += linux/systemd.cpp libmesos_no_3rdparty_la_SOURCES += slave/containerizer/linux_launcher.cpp - libmesos_no_3rdparty_la_SOURCES += slave/containerizer/mesos/mount.cpp libmesos_no_3rdparty_la_SOURCES += slave/containerizer/mesos/isolators/cgroups/cpushare.cpp libmesos_no_3rdparty_la_SOURCES += slave/containerizer/mesos/isolators/cgroups/mem.cpp libmesos_no_3rdparty_la_SOURCES += slave/containerizer/mesos/isolators/cgroups/perf_event.cpp http://git-wip-us.apache.org/repos/asf/mesos/blob/dcf88243/src/slave/containerizer/mesos/mount.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/mesos/mount.cpp b/src/slave/containerizer/mesos/mount.cpp index 462778c..0fdf2e1 100644 --- a/src/slave/containerizer/mesos/mount.cpp +++ b/src/slave/containerizer/mesos/mount.cpp @@ -24,7 +24,9 @@ #include <stout/nothing.hpp> #include <stout/try.hpp> +#ifdef __linux__ #include "linux/fs.hpp" +#endif // __linux__ using std::cerr; using std::endl; @@ -52,6 +54,7 @@ MesosContainerizerMount::Flags::Flags() int MesosContainerizerMount::execute() { +#ifdef __linux__ if (flags.operation.isNone()) { cerr << "Flag --operation is not specified" << endl; return 1; @@ -81,6 +84,11 @@ int MesosContainerizerMount::execute() } return 0; +#else + cerr << "Mount is only supported on Linux"; + + return 1; +#endif // __linux__ } } // namespace slave {
