diff --git a/README.md b/README.md index c7808bd6..07211879 100644 --- a/README.md +++ b/README.md @@ -32,10 +32,11 @@ in the `vscode-client` folder. # Build cquery $ git clone https://github.com/jacobdufault/cquery --recursive $ cd cquery -$ pushd third_party/sparsehash # This step will eventually be eliminated -$ ./configure # This step will eventually be eliminated -# sparsehash is header-only; building it is not required -$ popd # This step will eventually be eliminated +# Note: In the future we should not have to build sparsehash explicitly. +$ pushd third_party/sparsehash +$ ./configure +$ make +$ popd $ ./waf configure $ ./waf build diff --git a/src/platform_linux.cc b/src/platform_linux.cc index 9ec97c23..bb29c707 100644 --- a/src/platform_linux.cc +++ b/src/platform_linux.cc @@ -19,6 +19,7 @@ #include #include +#include #include // required for stat.h #include // no clue why required -- man pages say so @@ -29,7 +30,9 @@ #include /* For mode constants */ #include /* For O_* constants */ +#ifndef __APPLE__ #include +#endif struct PlatformMutexLinux : public PlatformMutex { sem_t* sem_ = nullptr; @@ -155,7 +158,9 @@ bool TryMakeDirectory(const std::string& absolute_path) { } void SetCurrentThreadName(const std::string& thread_name) { +#ifndef __APPLE__ prctl(PR_SET_NAME, thread_name.c_str(), 0, 0, 0); +#endif } std::vector GetPlatformClangArguments() {