From 4b0a509a9126411c492cffed64d123e98b46d385 Mon Sep 17 00:00:00 2001 From: sdong Date: Thu, 13 Aug 2020 14:48:08 -0700 Subject: [PATCH] Still use platform007 for gcc (#7253) Summary: We see some hosts failed to build platform009 with gcc. Revert the default to be platform007 if USE_CLANG is not specified. Pull Request resolved: https://github.com/facebook/rocksdb/pull/7253 Test Plan: Build with both of USE_CLANG=1 set and not set and observe it builds successfully, and see the tool chain used. Reviewed By: jay-zhuang Differential Revision: D23110550 fbshipit-source-id: 25cb47923f7174b24debdad0cc8d90b07c4d5d09 --- build_tools/build_detect_platform | 6 ++++++ build_tools/dependencies_platform009.sh | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/build_tools/build_detect_platform b/build_tools/build_detect_platform index e76cb9cd2..094d35e6b 100755 --- a/build_tools/build_detect_platform +++ b/build_tools/build_detect_platform @@ -62,6 +62,12 @@ if [ -z "$ROCKSDB_NO_FBCODE" -a -d /mnt/gvfs/third-party ]; then source "$PWD/build_tools/fbcode_config.sh" elif [ -n "$ROCKSDB_FBCODE_BUILD_WITH_PLATFORM007" ]; then source "$PWD/build_tools/fbcode_config_platform007.sh" + elif [ -n "$ROCKSDB_FBCODE_BUILD_WITH_PLATFORM009" ]; then + source "$PWD/build_tools/fbcode_config_platform009.sh" + elif [ -z "$USE_CLANG" ]; then + # Still use platform007 for gcc by default for build break on + # some hosts. + source "$PWD/build_tools/fbcode_config_platform007.sh" else source "$PWD/build_tools/fbcode_config_platform009.sh" fi diff --git a/build_tools/dependencies_platform009.sh b/build_tools/dependencies_platform009.sh index 37a56d3ab..8be50831d 100644 --- a/build_tools/dependencies_platform009.sh +++ b/build_tools/dependencies_platform009.sh @@ -15,6 +15,6 @@ LIBUNWIND_BASE=/mnt/gvfs/third-party2/libunwind/02486dac347645d31dce116f44e1de31 TBB_BASE=/mnt/gvfs/third-party2/tbb/2e0ec671e550bfca347300bf3f789d9c0fff24ad/2018_U5/platform009/7f3b187 LIBURING_BASE=/mnt/gvfs/third-party2/liburing/70dbd9cfee63a25611417d09433a86d7711b3990/20200729/platform009/7f3b187 KERNEL_HEADERS_BASE=/mnt/gvfs/third-party2/kernel-headers/32b8a2407b634df3f8f948ba373fc4acc6a18296/fb/platform009/da39a3e -BINUTILS_BASE=/mnt/gvfs/third-party2/binutils/08634589372fa5f237bfd374e8c644a8364e78c1/2.32/centos7-native/da39a3e +BINUTILS_BASE=/mnt/gvfs/third-party2/binutils/08634589372fa5f237bfd374e8c644a8364e78c1/2.32/platform009/ba86d1f/ VALGRIND_BASE=/mnt/gvfs/third-party2/valgrind/6ae525939ad02e5e676855082fbbc7828dbafeac/3.15.0/platform009/7f3b187 LUA_BASE=/mnt/gvfs/third-party2/lua/162efd9561a3d21f6869f4814011e9cf1b3ff4dc/5.3.4/platform009/a6271c4