From 2fc394a3274a89cfca7a46690a154ef35b0efde1 Mon Sep 17 00:00:00 2001 From: Dhruba Borthakur Date: Thu, 27 Dec 2012 14:49:24 -0800 Subject: [PATCH] Do not compile thrift for fbcode build. Summary: 1. The thrift libraries do not need to be built anyore. 2. SSE is dynamically detected via https://github.com/facebook/rocksdb/commit/1aae609b920f8cd4d93ac49798fa96367b9b864c Test Plan: compile and build Reviewers: sheki, emayanke Reviewed By: sheki CC: leveldb Differential Revision: https://reviews.facebook.net/D7665 --- fbcode.gcc471.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/fbcode.gcc471.sh b/fbcode.gcc471.sh index 0ada9e50d..50e742aa2 100644 --- a/fbcode.gcc471.sh +++ b/fbcode.gcc471.sh @@ -10,9 +10,6 @@ TOOLCHAIN_EXECUTABLES="/mnt/gvfs/third-party/$TOOLCHAIN_REV/centos5.2-native" TOOLCHAIN_LIB_BASE="/mnt/gvfs/third-party/$TOOLCHAIN_REV/gcc-4.7.1-glibc-2.14.1" TOOL_JEMALLOC=jemalloc-3.0.0/69dc57c -# always build thrift server -export USE_THRIFT=1 - # location of libhdfs libraries if test "$USE_HDFS"; then JAVA_HOME="/usr/local/jdk-6u22-64" @@ -37,9 +34,7 @@ LIBEVENT_INCLUDE=" -I $TOOLCHAIN_LIB_BASE/libevent/libevent-1.4.14b/91ddd43/incl LIBEVENT_LIBS=" -L $TOOLCHAIN_LIB_BASE/libevent/libevent-1.4.14b/91ddd43/lib" # use Intel SSE support for checksum calculations -if test -z "$USE_SSE"; then - export USE_SSE=" -msse -msse4.2 " -fi +export USE_SSE=" -msse -msse4.2 " CC="$TOOLCHAIN_EXECUTABLES/gcc/gcc-4.7.1-glibc-2.14.1/bin/gcc" CXX="$TOOLCHAIN_EXECUTABLES/gcc/gcc-4.7.1-glibc-2.14.1/bin/g++ $JINCLUDE $SNAPPY_INCLUDE $THRIFT_INCLUDE $LIBEVENT_INCLUDE"