bigtreeliujie closed pull request #235: fix third party build fail on ubuntu
16.04
URL: https://github.com/apache/incubator-doris/pull/235
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/thirdparty/build-thirdparty.sh b/thirdparty/build-thirdparty.sh
index b3944a7..5f15e58 100755
--- a/thirdparty/build-thirdparty.sh
+++ b/thirdparty/build-thirdparty.sh
@@ -52,13 +52,17 @@ export
LD_LIBRARY_PATH=$TP_DIR/installed/lib:$LD_LIBRARY_PATH
if [ -f $PALO_HOME/palo-toolchain/gcc730/bin/gcc ]; then
export GCC_HOME=$curdir/../palo-toolchain/gcc730
+ export CC=${GCC_HOME}/bin/gcc
+ export CPP=${GCC_HOME}/bin/cpp
+ export CXX=${GCC_HOME}/bin/g++
+else
+ export CC=gcc
+ export CPP=cpp
+ export CXX=g++
fi
-export CC=${GCC_HOME}/bin/gcc
-export CPP=${GCC_HOME}/bin/cpp
-export CXX=${GCC_HOME}/bin/g++
# Download thirdparties.
-sh $TP_DIR/download-thirdparty.sh $@
+$TP_DIR/download-thirdparty.sh $@
check_prerequest() {
local CMD=$1
@@ -367,7 +371,7 @@ build_ncurses() {
check_if_source_exist $NCURSES_SOURCE
cd $TP_SOURCE_DIR/$NCURSES_SOURCE
- CPPFLAGS="-I${TP_INCLUDE_DIR}" \
+ CPPFLAGS="-I${TP_INCLUDE_DIR} -P" \
LDFLAGS="-L${TP_LIB_DIR}" \
CFLAGS="-fPIC" \
./configure --prefix=$TP_INSTALL_DIR
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
