From 54db29b8f0d736f2a1e6abe1ce4230f6b71ed2ce Mon Sep 17 00:00:00 2001 From: Islam AbdelRahman Date: Tue, 7 Jun 2016 14:22:52 -0700 Subject: [PATCH] Use gvfs links in dependencies.sh Summary: Update `build_tools/update_dependencies.sh` to use /mnt/gvfs path in dependencies.sh This should prevent us from having errors because of changing the path of a compiler or a library Test Plan: make all -j64 USE_CLANG make all -j64 ROCKSDB_FBCODE_BUILD_WITH_481=1 make all -j64 Reviewers: andrewkr, sdong, yiwu Reviewed By: yiwu Subscribers: andrewkr, dhruba Differential Revision: https://reviews.facebook.net/D59295 --- build_tools/dependencies.sh | 4 ++-- build_tools/dependencies_4.8.1.sh | 4 ++-- build_tools/update_dependencies.sh | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build_tools/dependencies.sh b/build_tools/dependencies.sh index 49281a247..4e94e6d53 100644 --- a/build_tools/dependencies.sh +++ b/build_tools/dependencies.sh @@ -1,5 +1,5 @@ -GCC_BASE=/mnt/vol/engshare/fbcode/third-party2/gcc/4.9.x/centos6-native/108cf83/ -CLANG_BASE=/mnt/vol/engshare/fbcode/third-party2/llvm-fb/stable/centos6-native/7aaccbe/ +GCC_BASE=/mnt/gvfs/third-party2/gcc/ebc96bc2fb751b5a0300b8d91a95bdf24ac1d88b/4.9.x/centos6-native/108cf83 +CLANG_BASE=/mnt/gvfs/third-party2/llvm-fb/b91de48a4974ec839946d824402b098d43454cef/stable/centos6-native/7aaccbe LIBGCC_BASE=/mnt/gvfs/third-party2/libgcc/53e0eac8911888a105aa98b9a35fe61cf1d8b278/4.9.x/gcc-4.9-glibc-2.20/024dbc3 GLIBC_BASE=/mnt/gvfs/third-party2/glibc/ee36ac9a72dfac4a995f1b215bb4c0fc8a0f6f91/2.20/gcc-4.9-glibc-2.20/500e281 SNAPPY_BASE=/mnt/gvfs/third-party2/snappy/8c38a4c1e52b4c2cc8a9cdc31b9c947ed7dbfcb4/1.1.3/gcc-4.9-glibc-2.20/e9936bf diff --git a/build_tools/dependencies_4.8.1.sh b/build_tools/dependencies_4.8.1.sh index 9797ca272..e77ad5786 100644 --- a/build_tools/dependencies_4.8.1.sh +++ b/build_tools/dependencies_4.8.1.sh @@ -1,5 +1,5 @@ -GCC_BASE=/mnt/vol/engshare/fbcode/third-party2/gcc/4.8.1/centos6-native/cc6c9dc/ -CLANG_BASE=/mnt/gvfs/third-party2/clang/fc904e50a9266b9d7b98cae1993afa0c5aae1440/3.7.1/centos6-native/9d9ecb9/ +GCC_BASE=/mnt/gvfs/third-party2/gcc/ebc96bc2fb751b5a0300b8d91a95bdf24ac1d88b/4.8.1/centos6-native/cc6c9dc +CLANG_BASE=/mnt/gvfs/third-party2/llvm-fb/b91de48a4974ec839946d824402b098d43454cef/stable/centos6-native/7aaccbe LIBGCC_BASE=/mnt/gvfs/third-party2/libgcc/53e0eac8911888a105aa98b9a35fe61cf1d8b278/4.8.1/gcc-4.8.1-glibc-2.17/8aac7fc GLIBC_BASE=/mnt/gvfs/third-party2/glibc/ee36ac9a72dfac4a995f1b215bb4c0fc8a0f6f91/2.17/gcc-4.8.1-glibc-2.17/99df8fc SNAPPY_BASE=/mnt/gvfs/third-party2/snappy/8c38a4c1e52b4c2cc8a9cdc31b9c947ed7dbfcb4/1.1.3/gcc-4.8.1-glibc-2.17/c3f970a diff --git a/build_tools/update_dependencies.sh b/build_tools/update_dependencies.sh index 2919bf861..bae95fa07 100755 --- a/build_tools/update_dependencies.sh +++ b/build_tools/update_dependencies.sh @@ -64,8 +64,8 @@ touch "$OUTPUT" echo "Writing dependencies to $OUTPUT" # Compilers locations -GCC_BASE=`ls -d1 $TP2_LATEST/gcc/4.9.x/centos6-native/*/ | head -n1` -CLANG_BASE=`ls -d1 $TP2_LATEST/llvm-fb/stable/centos6-native/*/ | head -n1` +GCC_BASE=`readlink -f $TP2_LATEST/gcc/4.9.x/centos6-native/*/` +CLANG_BASE=`readlink -f $TP2_LATEST/llvm-fb/stable/centos6-native/*/` log_variable GCC_BASE log_variable CLANG_BASE @@ -101,8 +101,8 @@ touch "$OUTPUT" echo "Writing 4.8.1 dependencies to $OUTPUT" # Compilers locations -GCC_BASE=`ls -d1 $TP2_LATEST/gcc/4.8.1/centos6-native/*/ | head -n1` -CLANG_BASE=`ls -d1 /mnt/gvfs/third-party2/clang/fc904e50a9266b9d7b98cae1993afa0c5aae1440/3.7.1/centos6-native/*/ | head -n1` +GCC_BASE=`readlink -f $TP2_LATEST/gcc/4.8.1/centos6-native/*/` +CLANG_BASE=`readlink -f $TP2_LATEST/llvm-fb/stable/centos6-native/*/` log_variable GCC_BASE log_variable CLANG_BASE