From afb5f2210fce1096a7d023ae38103871369538ed Mon Sep 17 00:00:00 2001 From: heyongqiang Date: Tue, 4 Sep 2012 16:49:09 -0700 Subject: [PATCH] build scribe with thrift lib Summary: Summary: as subject Test Plan: test build Reviewers: dhruba Reviewed By: dhruba Differential Revision: https://reviews.facebook.net/D5145 --- build_detect_platform | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/build_detect_platform b/build_detect_platform index c0daeb70a..03fa29cc0 100755 --- a/build_detect_platform +++ b/build_detect_platform @@ -212,17 +212,12 @@ if test "$USE_HDFS"; then PLATFORM_LDFLAGS+=$HDFS_LDFLAGS fi -# shall we build thrift server -if test "$USE_THRIFT"; then - THRIFT_CCFLAGS=" -I./thrift -I./thrift/gen-cpp -I./thrift/lib/cpp -I/usr/include -std=gnu++0x" - THRIFT_LDFLAGS=" -lexample -lserver -lthrift_base -ltransport -lthrift_exception -lutil -L./thrift/libs " - COMMON_FLAGS+=$THRIFT_CCFLAGS - PLATFORM_LDFLAGS+=$THRIFT_LDFLAGS -fi - -#shall we build with scribe -if test "$USE_SCRIBE"; then - COMMON_FLAGS="$COMMON_FLAGS -I./thrift/lib/ -DUSE_SCRIBE" +# shall we build thrift server or scribe logger +if test "$USE_THRIFT" || test "$USE_SCRIBE" ; then + THRIFT_CCFLAGS=" -I./thrift -I./thrift/gen-cpp -I./thrift/lib/cpp -I/usr/include -std=gnu++0x" + THRIFT_LDFLAGS=" -lexample -lserver -lthrift_base -ltransport -lthrift_exception -lutil -L./thrift/libs " + COMMON_FLAGS+=$THRIFT_CCFLAGS + PLATFORM_LDFLAGS+=$THRIFT_LDFLAGS fi PLATFORM_CCFLAGS="$PLATFORM_CCFLAGS $COMMON_FLAGS"