Commit c227ceae authored by Wez Furlong's avatar Wez Furlong Committed by Facebook Github Bot

cmake in a _build subdir to fix macos build

Summary:
This addresses a hilarious but hard to trace build problem on
macOS.  The issue is that the build manages to resolve `folly/String.h`
in place of `string.h` and breaks compilation of `<cstring>` and all
that include it.

The resolution is to ensure that we generate a subdir for the cmake
build.

Reviewed By: simpkins

Differential Revision: D10520960

fbshipit-source-id: 9bebeda69c6e28ebca146f9b96ee01bedd2d6ef1
parent 9ae803c7
...@@ -8,6 +8,12 @@ from __future__ import unicode_literals ...@@ -8,6 +8,12 @@ from __future__ import unicode_literals
def fbcode_builder_spec(builder): def fbcode_builder_spec(builder):
return { return {
'steps': [ 'steps': [
builder.fb_github_cmake_install('folly/folly'), # on macOS the filesystem is typically case insensitive.
# We need to ensure that the CWD is not the folly source
# dir when we build, otherwise the system will decide
# that `folly/String.h` is the file it wants when including
# `string.h` and the build will fail.
builder.github_project_workdir('facebook/folly', '_build'),
builder.cmake_install('facebook/folly'),
], ],
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment