Page MenuHomePhabricator
Files F2829665

D4735.id15442.diff
No OneTemporary
Actions

D4735.id15442.diff
View Options

diff --git a/services/lib/docker/build_service.sh b/services/lib/docker/build_service.sh
--- a/services/lib/docker/build_service.sh
+++ b/services/lib/docker/build_service.sh
@@ -6,27 +6,8 @@
SCRIPT_DIR=$(cd "$(dirname "$0")"; pwd -P)
# folly hack - https://github.com/facebook/folly/pull/1231
-if [[ -f /usr/lib/folly/folly/detail/Demangle.h ]]; then
- # Legacy path-centric workflow
- sed -i 's/#if __has_include(<demangle.h>)/#if __has_include(<Demangle.h>)/g' \
- /usr/lib/folly/folly/detail/Demangle.h
- rm -rf lib
- mkdir lib
- pushd lib
- ln -s /usr/lib/folly .
- ln -s /usr/lib/glog .
- ln -s /usr/lib/double-conversion .
- popd # lib
-
- rm -rf _generated
- mkdir _generated
-
- "${SCRIPT_DIR}"/proto_codegen.sh
-else
- # New installation centric workflow
- sed -i 's/#if __has_include(<demangle.h>)/#if __has_include(<Demangle.h>)/g' \
- /usr/local/include/folly/detail/Demangle.h
-fi
+sed -i 's/#if __has_include(<demangle.h>)/#if __has_include(<Demangle.h>)/g' \
+ /usr/local/include/folly/detail/Demangle.h
rm -rf cmake/build
mkdir -p cmake/build

File Metadata

Mime Type
text/plain
Expires
Sat, Sep 28, 4:58 PM (7 h, 39 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2197262
Default Alt Text
D4735.id15442.diff (1 KB)

Event Timeline