From 28e703c02e4fb66f6b32803439b380e57630652d Mon Sep 17 00:00:00 2001 From: Adam Simpkins Date: Wed, 17 Apr 2019 13:50:39 -0700 Subject: [PATCH] use fb_github_project_workdir() for folly Summary: Update the folly spec to use `fb_github_project_workdir()` rather than just `github_project_workdir()`. This shouldn't have any impact for external github-based builds, but for our internal continuous integration builds this should make builds for downstream projects pick up the correct local version of folly that matches the commit of the downstream project that is being built. This behavior was unintentionally changed to not use the `fb_*` version in D10520960. Differential Revision: D14969380 fbshipit-source-id: 000b10525821fb5e0312d1869198a68befa0bd91 --- build/fbcode_builder/specs/folly.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/fbcode_builder/specs/folly.py b/build/fbcode_builder/specs/folly.py index 9227626c5..3d128b9c0 100644 --- a/build/fbcode_builder/specs/folly.py +++ b/build/fbcode_builder/specs/folly.py @@ -14,7 +14,7 @@ def fbcode_builder_spec(builder): # 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.fb_github_project_workdir('folly/_build'), builder.cmake_install('facebook/folly'), ], }